summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into 19737-read-only-auditor19737-read-only-auditorLin Jen-Shin2016-10-251371-12909/+30880
|\
| * Merge branch 'fix-container-registry-project-settings' into 'master' Sean McGivern2016-10-241-1/+1
| |\
| | * Fix typo in project settings that prevents users from enabling container regi...fix-container-registry-project-settingsAdam Niedzielski2016-10-241-1/+1
| * | Merge branch 'grapify-labels-api' into 'master' Rémy Coutable2016-10-242-56/+41
| |\ \
| | * | Grapify the labels APIgrapify-labels-apiRobert Schilling2016-10-242-56/+41
| * | | Merge branch 'sign_in_forgot_password' into 'master' Fatih Acet2016-10-243-1/+9
| |\ \ \
| | * \ \ Merge branch 'master' into sign_in_forgot_passwordBernardo Anderson2016-10-2215-42/+209
| | |\ \ \
| | * | | | Add empty line before media queryBernardo Anderson2016-10-221-0/+1
| | * | | | Fix sign in page Forgot your password link overlapBernardo Anderson2016-10-223-1/+8
| * | | | | Merge branch 'grapify-builds-api' into 'master' Rémy Coutable2016-10-241-83/+79
| |\ \ \ \ \
| | * | | | | Grapify builds APIgrapify-builds-apiRobert Schilling2016-10-241-83/+79
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'docs/fix-link-to-monitoring' into 'master' Achilleas Pipinellis2016-10-245-5/+5
| |\ \ \ \ \
| | * | | | | Fix old monitoring links to point to the new locationdocs/fix-link-to-monitoringAchilleas Pipinellis2016-10-245-5/+5
| * | | | | | Merge branch 'backup-docker-docs' into 'master' Achilleas Pipinellis2016-10-241-0/+4
| |\ \ \ \ \ \
| | * | | | | | Add an example of how to run the backups when using docker to the docsbackup-docker-docsDJ Mountney2016-10-211-0/+4
| * | | | | | | Merge branch 'luishgo/gitlab-ce-18898-filter-commits-per-path'Rémy Coutable2016-10-243-0/+14
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Added path parameter to Commits APILuis HGO2016-10-243-0/+14
| * | | | | | | Merge branch 'cache-clear-build-fix' into 'master' Douwe Maan2016-10-241-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | fixes build with cache:clear issuetiagonbotelho2016-10-241-0/+1
| * | | | | | | 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
| |\ \ \ \ \ \ \