summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove Filesystem check metrics that use too much CPU to handle requestspawel/disable_nfs_metrics_checks_39730Pawel Chojnacki2017-11-023-13/+6
* Merge branch 'jivl-fix-cancel-button-file-upload-new-issue' into 'master'Filipa Lacerda2017-11-023-3/+16
|\
| * Fix cancel button not working when uploading a file on the new issue pagejivl-fix-cancel-button-file-upload-new-issueJose Ivan Vargas2017-11-013-3/+16
* | Merge branch 'BDO-fixes' into 'master'38610-prevent-locked-files-from-being-editedRémy Coutable2017-11-021-6/+6
|\ \
| * | Fixes to changed / broken linksBDO-fixesBrendan O'Leary2017-10-301-6/+6
* | | Merge branch 'multi-file-editor-binary-editor' into 'master'Filipa Lacerda2017-11-022-6/+20
|\ \ \
| * | | Fix binary files not showing anything in edit modemulti-file-editor-binary-editorPhil Hughes2017-11-012-6/+20
* | | | Merge branch '35955-searchable-settings-puts-expand-collapse-toggle-in-an-inv...Tim Zallmann2017-11-028-51/+55
|\ \ \ \
| * | | | Stop sections from expanding when scrolling over the 1px section35955-searchable-settings-puts-expand-collapse-toggle-in-an-invalid-stateEric Eastwood2017-10-311-0/+4
| * | | | update settings panels to place "expanded" class on the correct elementMike Greiling2017-10-316-24/+24
| * | | | remove needlessly complicated, duplicate css class for expanded settings panelsMike Greiling2017-10-312-27/+27
* | | | | Merge branch 'vue-update' into 'master'Tim Zallmann2017-11-026-18/+22
|\ \ \ \ \
| * | | | | karma spec updatesvue-updatePhil Hughes2017-11-014-10/+14
| * | | | | Updated Vue to 2.5.1Phil Hughes2017-10-312-8/+8
* | | | | | Merge branch 'winh-i18n-contributors-page' into 'master'Phil Hughes2017-11-023-8/+14
|\ \ \ \ \ \
| * | | | | | Make contributors page translatableWinnie Hellmann2017-11-023-8/+14
|/ / / / / /
* | | | | | Merge branch '39363-fix-ls-files-encoding' into 'master'Douwe Maan2017-11-027-1/+8
|\ \ \ \ \ \
| * | | | | | Fix encoding issue with Repository.ls_filesKim Carlbäcker2017-11-027-1/+8
|/ / / / / /
* | | | | | Merge branch 'jivl-mobile-friendly-table-runners' into 'master'Annabel Dunstone Gray2017-11-013-16/+29
|\ \ \ \ \ \
| * | | | | | Mobile-friendly table on Admin Runnersjivl-mobile-friendly-table-runnersTakuya Noguchi2017-11-013-16/+29
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '39513-fix-gears-spinning-physically' into 'master'Clement Ho2017-11-012-3/+8
|\ \ \ \ \ \
| * | | | | | Fix autodevops graphic gears spinning based on physics39513-fix-gears-spinning-physicallyEric Eastwood2017-10-302-3/+8
* | | | | | | Merge branch 'fix-user-tab-activity-mobile' into 'master'Annabel Dunstone Gray2017-11-012-1/+13
|\ \ \ \ \ \ \
| * | | | | | | Fixed user profile tab being off-screenfix-user-tab-activity-mobilePhil Hughes2017-10-242-1/+13
* | | | | | | | Merge branch 'dco' into 'master'Marcia Ramos2017-11-011-6/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Move from doc to repo.dosire2017-11-011-6/+5
|/ / / / / / / /
* | | | | | | | Merge branch 'jlh-replace-cla' into 'master'Sid Sijbrandij2017-11-013-59/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Update CONTRIBUTING.mdjlh-replace-claJamie Hurewitz2017-10-311-1/+1
| * | | | | | | | Update CONTRIBUTING.mdJamie Hurewitz2017-10-311-240/+3
| * | | | | | | | Replace CLA with DCO and licenseErnst van Nierop2017-10-311-29/+2
| * | | | | | | | Replace CLA with link to DCO and licenseErnst van Nierop2017-10-311-25/+2
| * | | | | | | | Replace CLAJamie Hurewitz2017-10-311-5/+247
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'patch-29' into 'master'Douwe Maan2017-11-011-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typoMichael Kozono2017-11-011-1/+1
* | | | | | | | | Merge branch 'jej/lfs-change-detection' into 'master'Douwe Maan2017-11-018-41/+313
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Detect changes to LFS pointers for pruning and integrity checkJames Edwards-Jones2017-11-018-41/+313
* | | | | | | | | | Merge branch 'feature/plantuml-restructured-text-captions' into 'master'Douwe Maan2017-11-013-17/+27
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Update gitlab-markup and PlantUML docsMarkus Koller2017-11-013-17/+27
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'sh-disable-unicorn-sampling-sidekiq' into 'master'Douwe Maan2017-11-012-1/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Disable Unicorn sampling in Sidekiq since there are no Unicorn sockets to mon...sh-disable-unicorn-sampling-sidekiqStan Hu2017-11-012-1/+8
* | | | | | | | | | Merge branch 'docs/ci-disposable-env-fix' into 'master'28025-consider-using-webpack-dev-server-overlay-option-for-more-helpful-compile-errorsMarcia Ramos2017-11-011-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix wording on CI disposable variablesdocs/ci-disposable-env-fixAchilleas Pipinellis2017-10-211-2/+2
* | | | | | | | | | | Merge branch 'docs/webhook-troubleshooting-steps' into 'master'Marcia Ramos2017-11-011-0/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add extra webhook troubleshooting stepsdocs/webhook-troubleshooting-stepsCindy Pallares 🦉2017-11-011-0/+12
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-19-docs' into 'master'Sean McGivern2017-11-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | document that PostgreSQL 10.0 is not supportedBen Bodenmiller2017-10-311-1/+1
* | | | | | | | | | | Merge branch 'docs/no-comments' into 'master'🚄 Job van der Voort 🚀2017-11-01129-108/+570
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Exclude comments from specific docsAchilleas Pipinellis2017-11-01129-108/+570
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '35914-merge-request-update-worker-is-slow' into 'master'Sean McGivern2017-11-014-20/+44
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rework the UpdateMergeRequestsWorker#metrics_tags35914-merge-request-update-worker-is-slowmicael.bergeron2017-11-011-4/+2