Commit Graph
2253 Commits
Author SHA1 Message Date
Artem V. Navrotskiy 1be79e8e7c Move get user by ID of an SSH key documentation to separate file 2015-09-03 16:32:26 +03:00
Artem V. NavrotskiyandArtem V. Navrotskiy 8ec59bd18b Add API method for get user by ID of an SSH key 2015-09-03 15:47:22 +03:00
Kirilll Zaitsev 263abda3fd Drone CI service 2015-09-02 05:52:16 +03:00
Dmitriy Zaporozhets 2ef16e7660 Merge branch 'gitlab-git-http-server' into 'master'
Replace grack with gitlab-git-http-server

See merge request !1229
2015-09-01 14:21:45 +00:00
Job van der Voort bbfa65ac30 Merge branch 'add-commands' into 'master'
Added new commands to GitLab Basics docs



See merge request !1924
2015-09-01 09:32:18 +00:00
karen Carias c924a3a8d7 deleted additional info 2015-08-31 22:50:32 -07:00
Jacob Vosmaer 90b1ecfa01 Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-server 2015-08-31 15:51:41 +02:00
Jacob Vosmaer 4027a26e7b Replace grack with gitlab-git-http-server 2015-08-31 15:30:15 +02:00
Achilleas Pipinellis e334ec0683 Ordering of GitHub issues import is now fixed
See https://gitlab.com/gitlab-org/gitlab-ce/commit/4a203aab57c69ea402939cf8fc423a0e5aaa1cab
2015-08-31 08:24:50 +03:00
Job van der Voort 7bcce28df6 Merge branch 'fix' into 'master'
Fixed text about HTTP

Fixed for text to be more clear. Because of tweet https://twitter.com/mystygage/status/630798770012323840

See merge request !1921
2015-08-26 11:16:13 +00:00
karen Carias bff8376ab1 added new commands 2015-08-25 21:58:40 -07:00
karen Carias 9d40457766 added new commands 2015-08-25 21:57:10 -07:00
Douwe Maan 2088880383 Ignore empty incoming messages. 2015-08-24 10:57:35 -07:00
Sytse Sijbrandij cddf03f717 Specify the branch name of the blog post to prevent the use of spaces. 2015-08-22 19:11:02 +00:00
Douwe Maan 3abb356dd2 Add development documentation for real. 2015-08-21 15:13:22 -07:00
Douwe Maan 50baa1fdd1 Add development section to doc. 2015-08-21 15:03:16 -07:00
Douwe Maan 123af78561 Add gitlab:reply_by_email:check rake task. 2015-08-20 14:03:04 -07:00
Douwe Maan 3d51a6d435 Merge branch 'master' into reply-by-email 2015-08-20 12:19:19 -07:00
Douwe Maan 19a049ece9 Make documentation clearer. 2015-08-19 17:43:36 -07:00
Douwe Maan 34026c97b4 Add documentation. 2015-08-19 13:58:14 -07:00
Job van der Voort 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
Dmitriy Zaporozhets 72a425fa66 Merge branch 'remove-satellites'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-19 09:52:39 +02:00
karen Carias b04914ab46 added note about backing up recovery codes 2015-08-18 15:56:38 -07:00
Dmitriy Zaporozhets 89beb39fcc Make sure blog post MR has WIP keyword 2015-08-18 14:46:01 +00:00
karen Carias 10491b5438 deleted line 2015-08-17 14:42:34 -07:00
Dmitriy Zaporozhets 5d862509c3 Create update guides for 7.14
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 17:18:09 +02:00
Dmitriy Zaporozhets dcd3396337 Update installation guide with 7.14
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 17:13:33 +02:00
Dmitriy Zaporozhets 4a0fa27017 Merge branch 'master' into remove-satellites
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 11:41:53 +02:00
Dmitriy Zaporozhets 5f2562dfc5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-08-14 11:20:18 +02:00
Job van der Voort 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
Ben Boeckel 95f8f7c729 api: add 'system', 'upvote', and 'downvote' fields to note queries
This reverts commit 4c586dc7c2.
2015-08-12 17:02:33 -04:00
karen Carias 235acd2226 fixed text 2015-08-11 19:18:20 -07:00
karen Carias 1df163866f fixed text 2015-08-11 19:16:13 -07:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' "
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets c0bf026ed8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-11 14:29:43 +02:00
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'"
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 10:28:42 +02:00
Dmitriy Zaporozhets 84727fba96 Revert "Merge branch 'improve-merge-requests' into 'master' "
This reverts commit 4773f38e28, reversing
changes made to 0d5d80b735.
2015-08-11 10:26:19 +02:00
karen Carias 95aa13f0b7 fixed text 2015-08-10 17:17:30 -07:00
karen Carias 5ba2d53cfa fixed text 2015-08-10 16:56:02 -07:00
karen Carias e0642b2743 fixed conflict 2015-08-10 16:14:03 -07:00
karen Carias 37b4cfea3a fixed conflict and comment 2015-08-10 16:05:59 -07:00
karen Carias 8344c79508 fixed conflict and comment 2015-08-10 16:03:10 -07:00
Jan Tojnar 9195d65602 Doc: Fix link to gravatar.com 2015-08-10 23:47:32 +02:00
Sytse Sijbrandij (admin) b99cbf47af Database size 2015-08-10 18:39:50 +00:00
Robert Speicher a71bed53e0 Merge branch 'merge-notifs' into 'master'
See merge request !1077
2015-08-07 18:47:02 -04:00
karen Carias 082467e8e6 Info about not receiving emails 2015-08-07 13:07:04 -07:00
Achilleas Pipinellis 8ab6bd3eb3 Do a git checkout on Gemfile.lock and schema.rb prior to update. Fixes #2227 2015-08-07 22:13:18 +03:00
Dmitriy Zaporozhets 3c5ef17975 Link merge request doc to README
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 13:07:03 +02:00
Dmitriy Zaporozhets 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