summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'security-fix-leaking-namespace-name' into 'security' Douwe Maan2016-10-242-4/+4
* Merge branch 'barthc/gitlab-ce-prevent_authored_vote_from_notes'Rémy Coutable2016-10-243-4/+18
|\
| * Fix authored vote from notesbarthc2016-10-243-4/+18
* | Merge branch 'yesbabyyes/gitlab-ce-22967-adding-zero-users-to-group-reports-s...Dmitriy Zaporozhets2016-10-2411-30/+124
|\ \
| * | Update project member controller to match recent master logicyesbabyyes/gitlab-ce-22967-adding-zero-users-to-group-reports-successDmitriy Zaporozhets2016-10-241-9/+7
| * | Add parentheses around return redirect_to methodDmitriy Zaporozhets2016-10-242-2/+2
| * | Trigger change even in select2 test helper to produce production-like behaviourDmitriy Zaporozhets2016-10-241-2/+2
| * | Refactor js that disable form submit if no members selectedDmitriy Zaporozhets2016-10-243-6/+1
| * | Improve create project member test at project_members_controller_specDmitriy Zaporozhets2016-10-241-25/+16
| * | Move changelog item to 8.14Dmitriy Zaporozhets2016-10-241-1/+2
| * | Refactor create member tests from group_members_controller_specDmitriy Zaporozhets2016-10-241-41/+30
| * | Refactor groups/projects members controllerDmitriy Zaporozhets2016-10-242-9/+11
| * | Gracefully handle adding of no users to projects and groupsLinus G Thiel2016-10-248-3/+130
| * | Revert "Change "Group#web_url" to return "/groups/twitter" rather than "/twit...Dmitriy Zaporozhets2016-10-243-25/+16
| |/
* | Merge branch '21513-fix-branch-protection-api' into 'master' Douwe Maan2016-10-246-100/+220
|\ \
| * | Implement third round of review comments from @DouweM.21513-fix-branch-protection-apiTimothy Andrew2016-10-242-13/+4
| * | Implement second round of review comments from @DouweM.Timothy Andrew2016-10-243-14/+11
| * | Implement review comments from @DouweM.Timothy Andrew2016-10-243-14/+19
| * | Implement review comments from @dbalexandre.Timothy Andrew2016-10-241-37/+8
| * | Update CHANGELOGTimothy Andrew2016-10-241-0/+1
| * | Fix branch protection API.Timothy Andrew2016-10-245-98/+253
* | | Merge branch 'dz-fix-constrainer-for-relative-url' into 'master' Sean McGivern2016-10-243-1/+23
|\ \ \
| * | | Add changelog item for groups 404 on relative urldz-fix-constrainer-for-relative-urlDmitriy Zaporozhets2016-10-241-0/+1
| * | | Add relative url support to routing contrainersDmitriy Zaporozhets2016-10-242-1/+22
| | |/ | |/|
* | | Merge branch 'issue-boards-user-url' into 'master' Fatih Acet2016-10-242-2/+2
|\ \ \
| * | | Use root_url for issue boards user linkPhil Hughes2016-10-242-2/+2
* | | | Merge branch 'remove-callback' into 'master' Rémy Coutable2016-10-243-4/+8
|\ \ \ \
| * | | | refactor(email): use setter method instead AR callbacksSemyon Pupkov2016-10-233-4/+8
| | |_|/ | |/| |
* | | | Merge branch '#22609' into 'master' Rémy Coutable2016-10-245-4/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Move spec/mailers/shared/notify.rb to spec/supportJared Ready2016-10-225-4/+0
* | | | Merge remote-tracking branch 'origin/sh-flush-cache-after-import'Yorick Peterse2016-10-243-28/+21
|\ \ \ \
| * | | | Remove duplicate code in repository cache clearingsh-flush-cache-after-importStan Hu2016-10-231-8/+1
| * | | | Expire and build repository cache after project importStan Hu2016-10-233-20/+20
| | |/ / | |/| |
* | | | Merge branch 'sh-fix-mailroom-config' into 'master' Yorick Peterse2016-10-244-2/+66
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix reply-by-email not working due to queue name mismatchsh-fix-mailroom-configStan Hu2016-10-234-2/+66
| |/ /
* | | Merge branch '23557-remove-extra-line-for-empty-issue-description' into 'mast...Fatih Acet2016-10-244-3/+5
|\ \ \
| * | | removes extra line for empty milestone description23557-remove-extra-line-for-empty-issue-descriptionNur Rony2016-10-242-2/+2
| * | | code formatting correctedNur Rony2016-10-241-1/+1
| * | | Merge branch 'master' into 23557-remove-extra-line-for-empty-issue-descriptionNur Rony2016-10-2493-244/+816
| |\ \ \ | | |/ /
| * | | adds entry in CHANGELOGNur Rony2016-10-211-1/+1
| * | | removes extra line for empty issue descriptionNur Rony2016-10-212-1/+3
* | | | Merge branch 'document-absolute-links' into 'master' Rémy Coutable2016-10-241-0/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | Document link syntax introduced by !5586document-absolute-linksWinnie2016-10-211-0/+8
* | | | Merge branch 'sh-fix-broken-label-controller' into 'master' Rémy Coutable2016-10-223-1/+19
|\ \ \ \
| * | | | Fix status code expectationRémy Coutable2016-10-221-1/+1
| * | | | Fix error in generating labelssh-fix-broken-label-controllerStan Hu2016-10-223-1/+19
* | | | | Merge branch '23653-dont-clear-db-cache-every-release' into 'master' Yorick Peterse2016-10-221-1/+1
|\ \ \ \ \
| * | | | | Stop clearing the database cache on rake cache:clearNick Thomas2016-10-221-1/+1
* | | | | | Merge branch '23146_19131_build-api_scope-doc' into 'master' Rémy Coutable2016-10-223-6/+7
|\ \ \ \ \ \
| * | | | | | Fix documents and comments on Build API `scope`. #23146 #19131Lemures Lemniscati2016-10-223-6/+7
| | |_|_|_|/ | |/| | | |