Commit Graph
1658 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 77b6bd9b49 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-06-05 21:41:04 +03:00
Achilleas Pipinellis 7be6b8ca73 Move gitlab-ssl nginx config from gitlab-recipes 2014-06-05 16:54:50 +03:00
Ciro Santilli 27f32ac648 Remove conflict artifact. 2014-06-05 14:47:51 +02:00
Sytse Sijbrandij 4ed39a77ef Support Ruby 2.1 and better explain the memory requirements. 2014-06-05 08:45:12 +02:00
Jeroen van Baarsen 793955cdfc We need to change config in step 5 2014-06-04 23:04:44 +02:00
Sytse Sijbrandij 6e18d5e9be Merge branch 'master' into 'master'
Fixing typo in help for public access

Fixing a typo in the help page
2014-06-04 08:16:34 +00:00
Kaizer Sogiawala 0d861c9935 Fixing typo 2014-06-04 00:57:14 -07:00
Marin Jankovski 4147fc7eb6 Update patch release document. 2014-06-04 09:27:23 +02:00
Ciro Santilli fd348de76d Update docs to markdown style guide. 2014-06-03 23:16:31 +02:00
Marin Jankovski c8460c4731 Update the one-liner. 2014-06-02 09:48:55 +02:00
Marin Jankovski 379299ad18 Add bash one liner in updater doc due to change of updater location. 2014-06-02 09:39:43 +02:00
Dmitriy Zaporozhets 94b0f1b2bb Bump gitlab-shell version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-31 15:57:22 +03:00
Dmitriy Zaporozhets d54d3324b1 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-05-30 18:05:14 +03:00
Dmitriy Zaporozhets bd7c3955b1 Merge pull request #6882 from Tandrial/master
Satellites access fix
2014-05-30 16:59:02 +03:00
Dmitriy Zaporozhets d8c7efa626 Dont allow git tag rewrite/removal unless you are master
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-30 16:26:45 +03:00
Sytse Sijbrandij 5e20b0a73c Merge branch 'new_index_converter' into 'master'
New index converter
2014-05-29 16:58:48 +00:00
Jacob Vosmaer bc62c283c6 Download schema.rb.bundled if necessary 2014-05-29 15:42:20 +02:00
Dmitriy Zaporozhets 6fdd900827 Merge pull request #7014 from asedge/api_create_tag
Add CreateTagService.  Use new service to allow tag creation through API.
2014-05-29 15:37:42 +03:00
Dmitriy Zaporozhets ec837932d0 Merge pull request #7036 from willkara/patch-1
Too many zeros in CPU req listing
2014-05-29 15:19:27 +03:00
Dmitriy Zaporozhets 0e4bc4e6de Merge branch 'link-doc-help' into 'master'
Readme on the help page

Adds the readme from the docs to the help page instead of the current links.

Fixes #1117
2014-05-29 11:33:54 +00:00
Marin Jankovski 2dbf1a00a9 Ruby 2.0+ is a requirement. 2014-05-29 10:15:14 +02:00
Marin Jankovski 59797b2f2e Remove list items styling in show render. 2014-05-29 08:44:25 +02:00
William Karavites e52c4a62f2 Too many zeros in CPU req listing
There were too many zeros in the listing of users for CPU's.
2014-05-28 13:08:00 -04:00
Dmitriy Zaporozhets 1932f902d5 Allow masters to create projects in groups
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-28 19:04:42 +03:00
Jacob Vosmaer b7de9de4d2 Omnibus instructions for re-adding indexes 2014-05-28 17:09:20 +02:00
Sytse Sijbrandij c183019ce1 Merge branch 'use_newer_git_version' into 'master'
Use newer git version

Fixes #1272
2014-05-28 11:01:55 +00:00
Marin Jankovski 82855e078f Keep the lowest requirement for git in the documentation. 2014-05-28 12:53:10 +02:00
dosire ca907e4f9f Make it more obvious that GitLab Shell should be upgraded. 2014-05-28 09:28:39 +02:00
Dmitriy Zaporozhets 3682e72619 Merge branch 'move_script_to_bin' into 'master'
Move script to bin

Fixes #925
2014-05-27 17:03:34 +00:00
Dmitriy Zaporozhets d25bc25766 Merge branch 'gitlab_shell_in_upgrader_guide' into 'master'
Gitlab shell in upgrader guide

Fixes #1214
2014-05-27 15:34:47 +00:00
Dmitriy Zaporozhets 19ea36227a Merge branch 'add_titles_to_help_pages' into 'master'
Add titles to help pages

Fixes #1183
2014-05-27 15:33:15 +00:00
Marin Jankovski 2341cefd6f Move from script to bin directory. 2014-05-27 17:14:41 +02:00
Marin Jankovski cee88509a3 Fix typo in text. 2014-05-27 16:30:39 +02:00
dosire c8b58f0007 Cherry-pick the changelog additions into master. 2014-05-27 14:56:52 +02:00
Marin Jankovski 046647a746 Add directions on how to upgrade gitlab-shell in the upgrader guide. 2014-05-27 14:25:34 +02:00
Sean Edge a8f2977c6a More fixup for HoundCI. Fix up some small issues in docs. 2014-05-27 08:22:04 -04:00
Marin Jankovski f22c709539 Add titles to doc pages. 2014-05-27 14:12:15 +02:00
Dmitriy Zaporozhets 3bdf0e2921 Merge branch 'compare-api' into 'master'
Compare api

Fixes #1165
2014-05-27 11:16:07 +00:00
Marin Jankovski e101369994 Use newer version of git in installation doc. 2014-05-27 13:06:20 +02:00
Marin Jankovski 3553e36d16 Merge branch 'review-changelog' into 'master'
Review changelog

@dzaporozhets updates the changelog and notifies the team.
2014-05-27 10:35:35 +00:00
Dmitriy Zaporozhets 10ee137e9c Expose timeout and same_ref compare fields
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-27 11:16:50 +03:00
Dmitriy Zaporozhets 7ad5fb53ac Merge branch 'push-release-doc' into 'master'
Push release doc
2014-05-26 18:43:51 +00:00
Dmitriy Zaporozhets f48658813c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-05-26 21:38:41 +03:00
dosire b2ec09e5d6 Specify what version to test manually. 2014-05-26 17:09:31 +02:00
dosire fe10f37199 Add default arguments, name gitlab repo gl, suggest dotfile repo. 2014-05-26 15:54:06 +02:00
dosire c7a5530930 Small layout improvements. 2014-05-26 15:40:44 +02:00
dosire 75e90cb456 Push to all remotes doc. 2014-05-26 15:38:18 +02:00
Dmitriy Zaporozhets f441436e53 Add compare branches endpoint to API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-26 16:08:22 +03:00
dosire 1748073315 Correct typo. 2014-05-26 09:14:44 +02:00
dosire f39d8a8a60 Add any known bugs. 2014-05-26 09:12:57 +02:00