summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added slack slash commands frontend help wellslack-service-frontendLuke "Jared" Bennett2016-12-153-0/+145
* Create Slack Slash command servicezj-create-slack-serviceZ.J. van de Weg2016-12-093-0/+51
* Refactor chat commandsZ.J. van de Weg2016-12-0936-157/+320
* Refactor chat commands to use presentersZ.J. van de Weg2016-12-0823-175/+405
* Design wip for refactoring chat_commands presenterZ.J. van de Weg2016-12-084-85/+86
* Merge branch 'public-tags-api' into 'master' 19703-direct-link-pipelines-into-buildsDouwe Maan2016-12-084-10/+57
|\
| * Allow public access to some Tag API endpointspublic-tags-apiRémy Coutable2016-12-074-10/+57
* | Merge branch '24537-reenable-private-token-with-sudo' into 'master' Douwe Maan2016-12-0810-99/+390
|\ \
| * | adds impersonator variable and makes sudo usage overall more clear24537-reenable-private-token-with-sudotiagonbotelho2016-12-0710-100/+390
| * | Reenables /user API request to return private-token if user is admin and requ...tiagonbotelho2016-12-072-1/+2
* | | Merge branch 'fix-visible-content-spec-message' into 'master' Yorick Peterse2016-12-071-2/+2
|\ \ \
| * | | Update outdated visible content spec descriptionsfix-visible-content-spec-messageYorick Peterse2016-12-071-2/+2
* | | | Merge branch '25399-backup-task-is-not-working-on-8-15-pre' into 'master' Rémy Coutable2016-12-072-9/+137
|\ \ \ \
| * | | | Fix Backup::Manager#remove_old25399-backup-task-is-not-working-on-8-15-preSean McGivern2016-12-072-9/+137
* | | | | Merge branch '24565-fix-api-example-typos' into 'master' Rémy Coutable2016-12-072-9/+9
|\ \ \ \ \
| * | | | | Fix typos in API doc examplesRyan O'Boyle2016-11-162-9/+9
* | | | | | Merge branch 'build-with-gitlab-ce-ee-runners' into 'master' Kamil Trzciński2016-12-071-39/+69
|\ \ \ \ \ \
| * | | | | | Run builds with runners with tags gitlab-org and 2gbbuild-with-gitlab-ce-ee-runnersKamil Trzcinski2016-12-061-39/+69
* | | | | | | Merge branch 'grapify-issues-api' into 'master' Rémy Coutable2016-12-073-179/+126
|\ \ \ \ \ \ \
| * | | | | | | Grapify the issues APIgrapify-issues-apiRobert Schilling2016-12-073-179/+126
* | | | | | | | Merge branch 'docs/link-update-university' into 'master' Sean Packham2016-12-071-6/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | new DevOps report, 404s, typosja-me-sk2016-12-061-6/+6
* | | | | | | | Merge branch 'update-git-version-in-doc' into 'master' Marin Jankovski2016-12-073-5/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump Git version requirement to 2.8.4update-git-version-in-docRémy Coutable2016-12-013-5/+9
* | | | | | | | | Merge branch 'update-gitlab-shell' into 'master' Yorick Peterse2016-12-071-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Bump gitlab-shell version to 4.0.3update-gitlab-shellRuben Davila2016-12-061-1/+1
* | | | | | | | | Merge branch 'move-admin-hooks-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-074-31/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move admin hooks spinach to rspecSemyon Pupkov2016-12-064-31/+12
* | | | | | | | | | Merge branch 'move-admin-logs-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-074-19/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move admin logs spinach test to rspecSemyon Pupkov2016-12-064-19/+19
* | | | | | | | | | | Merge branch 'ux-guide-animation' into 'master' Achilleas Pipinellis2016-12-077-22/+56
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Create animation page and clean up indexux-guide-animationawhildy2016-12-057-22/+56
* | | | | | | | | | | | Merge branch '25209-improve-length-validators' into 'master' Rémy Coutable2016-12-0718-46/+89
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Use :maximum instead of :within for length validators with a 0..N range25209-improve-length-validatorsRémy Coutable2016-12-0618-46/+89
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-7' into 'master' Achilleas Pipinellis2016-12-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update php.md - /.dockerinit was removed in v1.11 so the test always results ...Sam Carrington2016-12-011-1/+1
* | | | | | | | | | | | Merge branch 'excoveralls_coverage' into 'master' Rémy Coutable2016-12-071-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add excoveralls examplePotHix2016-12-051-0/+3
* | | | | | | | | | | | | Merge branch 'patch-6' into 'master' Sean McGivern2016-12-071-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update custom_hooks.md for global custom hooks and chained hook infoElan Ruusamäe2016-12-061-0/+20
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'dz-fix-group-label-404' into 'master' Rémy Coutable2016-12-072-11/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix 404 error when visit group label edit pagedz-fix-group-label-404Dmitriy Zaporozhets2016-12-062-11/+32
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'remove-has-visible-content-caching' into 'master' Douwe Maan2016-12-073-42/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove caching of Repository#has_visible_content?remove-has-visible-content-cachingYorick Peterse2016-12-063-42/+7
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'cleanup-7180' into 'master' Robert Schilling2016-12-061-9/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | A simpler implementation of finding a merge requestBob Van Landuyt2016-12-061-9/+6
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'remove-pages-css' into 'master' Jacob Schatz2016-12-065-35/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'remove-pages-css'remove-pages-cssAnnabel Dunstone Gray2016-12-0619-250/+192
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove confirmation.scssAnnabel Dunstone Gray2016-12-062-35/+4
| * | | | | | | | | | | | | Move award emojis to framworkAnnabel Dunstone Gray2016-12-062-0/+2