summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Handle permissions for ExternalIssue instancesfix-git-push-service-specsYorick Peterse2016-03-092-2/+7
* Fixed part of the GitPushService specsYorick Peterse2016-03-091-5/+6
* Merge branch 'retry-tests' into 'master' Kamil Trzciński2016-03-098-36/+83
|\
| * Fix script errorKamil Trzcinski2016-03-091-1/+1
| * Retry apt-get installation and bundle installKamil Trzcinski2016-03-092-8/+20
| * Retry spinach testsKamil Trzcinski2016-03-095-28/+53
| * Retry failed testsKamil Trzcinski2016-03-094-0/+10
|/
* Merge branch 'iurisilvio/gitlab-ce-bitbucket_closed' into 'master' Rémy Coutable2016-03-093-1/+90
|\
| * Fix bug where Bitbucket `closed` issues were imported as `opened`iurisilvio/gitlab-ce-bitbucket_closedIuri de Silvio2016-03-073-1/+90
* | Merge branch 'update-db-schema' into 'master' Yorick Peterse2016-03-091-0/+1
|\ \
| * | Added main_language to the schemaYorick Peterse2016-03-091-0/+1
|/ /
* | Merge branch 'fix/upgrader-docs' into 'master' Achilleas Pipinellis2016-03-091-1/+1
|\ \
| * | Fix URL to upgrader guideJonas Friedmann2016-03-091-1/+1
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-03-0921-69/+42
|\ \ \
| * \ \ Merge branch 'rs-traits-are-good' into 'master' Dmitriy Zaporozhets2016-03-098-36/+32
| |\ \ \
| | * | | Make better use of the `visibility_level` factory traitsrs-traits-are-goodRobert Speicher2016-03-085-20/+19
| | * | | Simplify the various Snippet factoriesRobert Speicher2016-03-083-16/+13
| * | | | Merge branch 'rs-snippets-dont-expire' into 'master' Dmitriy Zaporozhets2016-03-0913-33/+10
| |\ \ \ \
| | * | | | Remove `Snippet#expires_at`rs-snippets-dont-expireRobert Speicher2016-03-0513-33/+10
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-03-092-2/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'security_bug_fix_close_issue' into 'master' Douwe Maan2016-03-052-2/+6
| |\ \ \ \ \
| | * | | | | Security: Fix issue auto closingValery Sizov2016-03-032-2/+6
* | | | | | | Merge branch 'improve-archived-projects'Dmitriy Zaporozhets2016-03-0916-69/+93
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Updated project list dropdown to use dropdown classesimprove-archived-projectsPhil Hughes2016-03-052-32/+11
| * | | | | | Align projects sort checkboxDmitriy Zaporozhets2016-03-042-1/+22
| * | | | | | Fix testDmitriy Zaporozhets2016-03-041-1/+1
| * | | | | | Show active sorting method for projects listDmitriy Zaporozhets2016-03-042-21/+26
| * | | | | | Add test for archive toggle featureDmitriy Zaporozhets2016-03-043-0/+10
| * | | | | | Add projects list sort dropdown to group pageDmitriy Zaporozhets2016-03-042-6/+9
| * | | | | | Make projects sort dropdown shared so it can be reused for other pagesDmitriy Zaporozhets2016-03-044-23/+15
| * | | | | | Add option to show archived projects on dahsboardDmitriy Zaporozhets2016-03-044-22/+36
* | | | | | | Merge branch 'branch-tag-count-methods' into 'master' Robert Speicher2016-03-086-14/+155
|\ \ \ \ \ \ \
| * | | | | | | Call after_create_branch in Repository#add_branchbranch-tag-count-methodsYorick Peterse2016-03-082-1/+8
| * | | | | | | Call the right hooks in Repository#add_tagYorick Peterse2016-03-082-1/+13
| * | | | | | | Added specs for Repository#rm_tagYorick Peterse2016-03-081-0/+11
| * | | | | | | Call the right hooks when removing branchesYorick Peterse2016-03-082-2/+19
| * | | | | | | Cache & flush tag/branch countsYorick Peterse2016-03-086-10/+104
* | | | | | | | Merge branch 'evuez/gitlab-ce-add-info-user-api' into 'master' Robert Speicher2016-03-084-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Add fields to GET /users/* API endpoints for adminsevuez/gitlab-ce-add-info-user-apievuez2016-03-044-0/+7
* | | | | | | | | Merge branch 'improve/3102-memoize-group-instance-variable-in-admin-groups-co...Robert Speicher2016-03-082-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove instance variable @group multiple assignmentYatish Mehta2016-03-082-1/+2
* | | | | | | | | | Merge branch 'remove-duplicate-cache_store-in-test-config' into 'master' Robert Speicher2016-03-081-2/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove duplicate 'cache_store' configuration in test environmentremove-duplicate-cache_store-in-test-configRémy Coutable2016-03-021-2/+0
* | | | | | | | | | | Merge branch 'sql-guide' into 'master' Robert Speicher2016-03-082-0/+220
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Added basic SQL guidelinessql-guideYorick Peterse2016-03-082-0/+220
* | | | | | | | | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-03-081-10/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | update slack instructionsElan Ruusamäe2016-03-011-10/+2
* | | | | | | | | | | | Merge branch 'patch-2' into 'master' Achilleas Pipinellis2016-03-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | add link to web hooks Ben Bodenmiller2016-03-031-1/+1
* | | | | | | | | | | | Merge branch 'master' into 'master' Yorick Peterse2016-03-087-0/+58
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |