Commit Graph
18287 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 67654a44d1 Avoid cache building for super-weird case when repository root_ref is nil
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-17 16:03:38 +02:00
Marin Jankovski 302c52551a Fix failing specs after adding format verification for token and project url in gitlab ci service. 2015-07-17 15:58:26 +02:00
Stan Hu df2bb60f90 Add support for destroying project milestones
Closes https://github.com/gitlabhq/gitlabhq/issues/1504
2015-07-17 06:54:32 -07:00
Marin Jankovski c3e35917fb Validate format of project_url and token for GitLab CI service. 2015-07-17 15:26:09 +02:00
Dmitriy Zaporozhets f0116f1335 Store commit count in project table
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-17 15:22:56 +02:00
Dmitriy Zaporozhets 67ca5a53f6 Build missing cache items in background job after each push
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-17 14:50:03 +02:00
Dmitriy Zaporozhets 881fbe5070 Add more seed projects. Control amount with SIZE env variable
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-17 13:59:40 +02:00
Dmitriy Zaporozhets c4c41007ad Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-17 12:19:39 +02:00
Sytse Sijbrandij 95400db9c8 Clean up editions paragraph 2015-07-17 09:56:34 +00:00
Sytse Sijbrandij 5d168588c0 Update installation instructions. 2015-07-17 09:52:41 +00:00
Sytse Sijbrandij 2590b16cb4 Improve the layout of the readme. 2015-07-17 09:50:37 +00:00
Stan Hu 6c9f527b3f Return comments in created order in merge request API
Closes #1832
2015-07-16 22:33:58 -07:00
Job van der Voort a98ca3e815 Merge branch 'chef-docker' into 'master'
Added note about chef

Added note about chef being required to generate GitLab config. because of tweet https://twitter.com/grahamgilbert/status/621015318442459136

See merge request !982
2015-07-16 20:19:51 +00:00
Job van der Voort b351e6f50c Merge branch 'create-branch' into 'master'
Added new doc about creating a new branch

Added new document about creating a branch and fixed bullets in all the other documents. Also fixed "git push REMOTE BRANCH".

See merge request !1894
2015-07-16 18:36:12 +00:00
karen Carias 70a08acedf fixed conflict 2015-07-16 11:25:12 -07:00
karen Carias 53d40b8ab1 changed some text 2015-07-16 11:18:10 -07:00
Dmitriy Zaporozhets 66bdbdb35d Remove satellites mention from architecture doc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16 17:57:46 +02:00
Dmitriy Zaporozhets fa88f2c084 Use real branches from test repo
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16 17:09:20 +02:00
Dmitriy Zaporozhets abd2bc00f9 Fix some of tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16 17:04:49 +02:00
Dmitriy Zaporozhets 989329c9d9 Fix refresh service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16 16:34:58 +02:00
Dmitriy Zaporozhets 971e47520f Increase COMMITS_SAFE_SIZE to reasonable size in compare to diff limits. Fix reload with full diff link
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16 16:32:43 +02:00
Dmitriy Zaporozhets a7fded9b95 Huge refactoring for accepting merge requests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16 16:03:07 +02:00
Sytse Sijbrandij 458053bcb4 Merge branch 'improve-readme' into 'master'
Document should start from h1 title. Also put badges on top for easier tracking

Looks much better with new project page design. 

See merge request !983
2015-07-16 12:44:59 +00:00
Dmitriy Zaporozhets c8758357b1 Document should start from h1 title. Also put badges on top for easier tracking 2015-07-16 12:13:09 +00:00
Marin Jankovski 9b6f1c5948 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-16 12:11:25 +02:00
Marin Jankovski f502a83b05 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-07-16 12:11:08 +02:00
karen Carias 4944df86fa added additional space 2015-07-15 16:40:20 -07:00
karen Carias 6096c0296d added note about chef 2015-07-15 11:13:40 -07:00
Dmitriy Zaporozhets 26f5d6047d Refactor compare and fetch logic 2015-07-15 17:28:09 +02:00
Dmitriy Zaporozhets cb6f34e367 Implement update of ref when merge request code is reloaded 2015-07-15 16:52:50 +02:00
Dmitriy Zaporozhets 2a6f522cac Implement merge from forks without satellites 2015-07-15 16:45:50 +02:00
Dmitriy Zaporozhets d9078749a5 Merge branch 'time_ago_fix' into 'master'
Time ago fix for branch compare page

https://dev.gitlab.org/gitlab/gitlabhq/issues/2508

See merge request !1904
2015-07-15 14:38:04 +00:00
Dmitriy Zaporozhets 2be3c94925 Fix application initialize 2015-07-15 15:59:38 +02:00
Valery Sizov d2479a25c7 Time ago fix for compare page 2015-07-15 16:59:31 +03:00
Dmitriy Zaporozhets a87989fb7d Remove satellites 2015-07-15 15:45:57 +02:00
Dmitriy Zaporozhets 277f311f20 Fetch reference from fork repo when create merge request 2015-07-15 15:27:14 +02:00
Jacob Vosmaer 82bb5c5e03 Expire Rails cache entries after two weeks
This should help prevent endless Redis growth.
2015-07-15 13:53:40 +02:00
Stan Hu bce9315ade Merge pull request #9455 from rburchell/patch-1
Remove author information from "post" in merge_requests API.
2015-07-14 23:44:40 -07:00
Stan Hu daed441dfe Merge branch 'merge-request-wip-information' into 'master'
api: expose work_in_progress flag

See merge request !948
2015-07-15 01:13:05 +00:00
Kamil Trzciński e62b579793 Merge branch 'docker-image' into 'master'
Fix docker image

See merge request !979
2015-07-14 17:48:08 +00:00
Kamil Trzcinski 753f34c8fa Fix docker image 2015-07-14 19:46:55 +02:00
Sytse Sijbrandij 997a3b1d87 Revert password change changelog entry. 2015-07-14 18:02:41 +02:00
Sytse Sijbrandij b3ab0e4efb Revert "Change default admin password from "5iveL!fe" to "password""
This reverts commit 8a01a12228.
2015-07-14 17:59:36 +02:00
Job van der Voort 1da6d42bca Merge branch 'notifications-title' into 'master'
fixed notifications title

I fixed the title and link to this document because I believe that it's more clear and easier to find if it has "emails" in the name.


See merge request !1897
2015-07-14 15:24:34 +00:00
Dmitriy Zaporozhets 070d6a2452 Merge branch 'fix-ed' into 'master'
Fix path to move_drop_indexes.ed

Small documentation fix.

See merge request !1900
2015-07-14 12:08:26 +00:00
Dmitriy Zaporozhets 67ad6cc7b4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-14 12:56:48 +02:00
Dmitriy Zaporozhets 2280cb23d4 Merge branch 'nice-scroll-sidebar' into 'master'
Add nice scroll for sidebar

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !978
2015-07-14 10:48:21 +00:00
Dmitriy Zaporozhets 77216386be Merge branch 'scrollbar-issue' into 'master'
Hide scrollbar from sidebar when external mouse is connected to OSX

See merge request !977
2015-07-14 10:47:29 +00:00
Dmitriy Zaporozhets 98cb6256fa Add nice scroll for sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-14 12:29:57 +02:00
Valery Sizov bf3c970be9 Merge branch 'update-guide-713' into 'master'
create update guides for 7.13



See merge request !1899
2015-07-14 10:12:54 +00:00