3659d3b5c6
Merge branch 'security' into 'master'
...
Added note about backing up recovery codes
Several people have tried to recover their 2FA codes. I think we could be more clear about it in the docs.
This is why I added a section about it at the top, so they read it before enabling them.
https://twitter.com/deathgreps/status/632006221814464512
https://twitter.com/benniemosher/status/633768429313372160
See merge request !1923
2015-08-19 10:27:03 +00:00
72a425fa66
Merge branch 'remove-satellites'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-19 09:52:39 +02:00
b04914ab46
added note about backing up recovery codes
2015-08-18 15:56:38 -07:00
89beb39fcc
Make sure blog post MR has WIP keyword
2015-08-18 14:46:01 +00:00
5d862509c3
Create update guides for 7.14
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 17:18:09 +02:00
dcd3396337
Update installation guide with 7.14
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 17:13:33 +02:00
4a0fa27017
Merge branch 'master' into remove-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 11:41:53 +02:00
5f2562dfc5
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-08-14 11:20:18 +02:00
d891b23e62
Merge branch 'add-image' into 'master'
...
New doc about how to add an image in GitLab Basics
See merge request !1918
2015-08-13 12:05:16 +00:00
95f8f7c729
api: add 'system', 'upvote', and 'downvote' fields to note queries
...
This reverts commit 4c586dc7c2
2015-08-12 17:02:33 -04:00
235acd2226
fixed text
2015-08-11 19:18:20 -07:00
1df163866f
fixed text
2015-08-11 19:16:13 -07:00
3e259ea8bc
Revert "Merge branch 'revert-satellites' into 'master'
"
...
This reverts commit 5daf44b7c82f706fbd23
2015-08-11 14:33:31 +02:00
c0bf026ed8
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-11 14:29:43 +02:00
5daf44b7c8
Merge branch 'revert-satellites' into 'master'
...
Revert satellites
Return satellites to master for 7.14
We remove satellites in next release (8.0)
See merge request !1136
2015-08-11 12:27:38 +00:00
9f10943c1a
Revert "Merge branch 'drop-satellites'"
...
This reverts commit 957e849f416b9dbe9f5a
2015-08-11 10:28:42 +02:00
84727fba96
Revert "Merge branch 'improve-merge-requests' into 'master'
"
...
This reverts commit 4773f38e280d5d80b735
2015-08-11 10:26:19 +02:00
95aa13f0b7
fixed text
2015-08-10 17:17:30 -07:00
e0642b2743
fixed conflict
2015-08-10 16:14:03 -07:00
37b4cfea3a
fixed conflict and comment
2015-08-10 16:05:59 -07:00
8344c79508
fixed conflict and comment
2015-08-10 16:03:10 -07:00
9195d65602
Doc: Fix link to gravatar.com
2015-08-10 23:47:32 +02:00
b99cbf47af
Database size
2015-08-10 18:39:50 +00:00
a71bed53e0
Merge branch 'merge-notifs' into 'master'
...
See merge request !1077
2015-08-07 18:47:02 -04:00
082467e8e6
Info about not receiving emails
2015-08-07 13:07:04 -07:00
8ab6bd3eb3
Do a git checkout on Gemfile.lock and schema.rb prior to update. Fixes #2227
2015-08-07 22:13:18 +03:00
3c5ef17975
Link merge request doc to README
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 13:07:03 +02:00
86bccb71a1
Create ref for every merge request. Add documentation for fetch merge requests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 12:54:58 +02:00
bac34a38f6
fixed one line
2015-08-06 22:40:38 -07:00
4f24eb2aa6
Merge branch 'master' into merge-notifs
2015-08-06 12:16:36 +02:00
c6799b0e1e
Update notification docs
2015-08-06 12:16:05 +02:00
fff36a8b89
Merge branch 'fix-link-to-guide' into 'master'
...
Replace relative url with full path, remove old reference for indexes
See merge request !1091
2015-08-06 09:12:51 +00:00
ce47dd4bb0
Update stable branch in installation documentation. Fixes #2191
2015-08-05 21:09:24 +03:00
957e849f41
Merge branch 'drop-satellites'
2015-08-05 15:40:14 +02:00
6b9dbe9f5a
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-05 14:51:24 +02:00
58c0c86dbd
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2015-08-05 14:50:32 +02:00
7538be71e0
Merge branch 'update_release_doc' into 'master'
...
update release doc
See merge request !1097
2015-08-05 12:42:03 +00:00
72943ee7e2
Merge branch 'server-note' into 'master'
...
Added note about changing servers
Because of tweet https://twitter.com/elraro21/status/628650106850516992
See merge request !1919
2015-08-05 12:39:16 +00:00
a567dd20d4
update release doc
2015-08-05 14:11:25 +03:00
1cb8588c66
Remove satellites from requirements docs and add CHANGELOG
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-05 11:49:02 +02:00
46a84d8013
Merge branch 'rs-issue-2135' into 'master'
...
Update docs for Ruby MRI 2.1 requirement
Addresses #2135
See merge request !1089
2015-08-05 09:21:03 +00:00
c90e592e91
Replace relative url with full path, remove old reference for indexes
...
Closes #2176 (gitlab.com)
2015-08-05 08:38:40 +03:00
4c9ba632e9
Merge branch 'master' into 'master'
...
updated restore docs wrt backup location [ci skip]
Made sure to point out that the restore location can be overwritten by
an entry in the config.
See merge request !1030
2015-08-04 21:56:27 +00:00
b83b333217
added note about changing servers
2015-08-04 14:51:08 -07:00
f9d71c4b91
Update docs for Ruby MRI 2.1 requirement
2015-08-04 17:07:12 -04:00
b48b07044b
Merge branch 'master' into drop-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 16:42:36 +02:00
326b827ce3
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-04 15:23:11 +02:00
e9ba1185f2
Merge branch 'add-user' into 'master'
...
Added new doc about adding users and members
Added new doc in workflow about how to add users and members and I also linked it to "permissions".
See merge request !1916
2015-08-04 08:46:47 +00:00
c5a6c16dba
typo
2015-08-03 15:55:02 -07:00
28cc6d9b98
text fixed
2015-08-03 15:51:09 -07:00
Job van der Voort
Dmitriy Zaporozhets
karen Carias
Ben Boeckel
Jan Tojnar
Sytse Sijbrandij (admin)
Robert Speicher
Achilleas Pipinellis
Douwe Maan
Valery Sizov