summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
* | | | Merge branch 'patch-3' into 'master' Rémy Coutable2016-10-221-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix docker.sock reference in config.toml Niels Keurentjes2016-07-101-1/+1
* | | | Merge branch 'ldap-login-styles' into 'master' Jacob Schatz2016-10-223-3/+35
|\ \ \ \
| * | | | Ensure custom provider tab labels don't break layout.ldap-login-stylesBryce Johnson2016-10-203-3/+35
* | | | | Merge branch '22892-cycle-analytics-date-filter-is-not-working' into 'master' Fatih Acet2016-10-222-1/+6
|\ \ \ \ \
| * | | | | Update CHANGELOG22892-cycle-analytics-date-filter-is-not-workingAlfredo Sumaran2016-10-211-0/+1
| * | | | | Fix object data to be sent to fetch analytics dataAlfredo Sumaran2016-10-211-1/+5
* | | | | | Merge branch 'docs/dynamic-envs-yaml' into 'master' Achilleas Pipinellis2016-10-221-25/+135
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Refactor and add new functionality to CI yaml referencedocs/dynamic-envs-yamlAchilleas Pipinellis2016-10-201-25/+135
* | | | | | Merge branch 'sh-add-mailers-to-sidekiq-config' into 'master' v8.14.0.preStan Hu2016-10-221-0/+1
|\ \ \ \ \ \
| * | | | | | Fix bug where e-mails were not being sent out via SidekiqStan Hu2016-10-211-0/+1
|/ / / / / /
* | | | | | Merge branch 'fix-example-in-api-documentation' into 'master' Rémy Coutable2016-10-222-4/+4
|\ \ \ \ \ \
| * | | | | | Fix wrong endpoint in api/users documentation, fix same typo in spec describe...Airat Shigapov2016-10-212-4/+4
* | | | | | | Merge branch 'project-settings--features-weight' into 'master' Annabel Dunstone Gray2016-10-212-60/+72
|\ \ \ \ \ \ \
| * | | | | | | fix font weight of project feature settingsproject-settings--features-weighttauriedavis2016-10-202-60/+72
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'separate-sidekiq-queues' into 'master' Douwe Maan2016-10-2162-68/+425
|\ \ \ \ \ \ \
| * | | | | | | Re-organize queues to use for Sidekiqseparate-sidekiq-queuesYorick Peterse2016-10-2162-68/+425
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'patch-6' into 'master' Rémy Coutable2016-10-211-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Grammar fixes in docsWilfred Hughes2016-10-031-3/+3
* | | | | | | | Merge branch 'patch-6' into 'master' Rémy Coutable2016-10-211-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Changed gitlab-shell version to avoid warning when precompiling the assets.Ismael Arenzana2016-10-071-1/+1
* | | | | | | | Merge branch 'fix-bulk-assign-issues-for-external-issues' into 'master' Sean McGivern2016-10-212-1/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Ignore external issues when bulk assigning issues to author of merge request.fix-bulk-assign-issues-for-external-issuesAdam Niedzielski2016-10-202-1/+13
* | | | | | | | | Merge branch 'adam-fix-group-web-url' into 'master' Sean McGivern2016-10-213-16/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change "Group#web_url" to return "/groups/twitter" rather than "/twitter".Adam Niedzielski2016-10-213-16/+25
* | | | | | | | | | Merge branch 'bugfix/add_hover_to_trash_icon' into 'master' Annabel Dunstone Gray2016-10-212-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add hover to trash icon in notesblackst0ne2016-10-212-1/+2
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'compare-ellipsis-line' into 'master' Fatih Acet2016-10-211-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed compare ellipsis messing with layoutPhil Hughes2016-10-211-1/+1
* | | | | | | | | | | Merge branch 'runners-paginate' into 'master' Rémy Coutable2016-10-213-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix error 500 on Runners page.Libor Klepáč2016-08-083-3/+3
* | | | | | | | | | | | Merge branch 'fixed-mr-tabs-fixes' into 'master' Fatih Acet2016-10-214-48/+62
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed issue when images are loading it would push off the tabsfixed-mr-tabs-fixesPhil Hughes2016-10-201-2/+8
| * | | | | | | | | | | Fixed issues with sticky mr tabs & sidebarPhil Hughes2016-10-204-46/+54
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix_project_member_access_levels' into 'master' Sean McGivern2016-10-215-1/+64
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Fix project member access levelsfix_project_member_access_levelsValery Sizov2016-10-215-1/+64
* | | | | | | | | | | Merge branch 'master' into 'master' Rémy Coutable2016-10-211-0/+0
|\ \ \ \ \ \ \ \ \ \ \