summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add crsf token in axios calls39726-add-crsf-token-axiosFilipa Lacerda2017-11-022-0/+8
|
* Merge branch 'docs/gitlab-runner' into 'master'Marcia Ramos2017-11-029-16/+16
|\ | | | | | | | | | | | | Change to new GitLab Runner name Closes #39636 See merge request gitlab-org/gitlab-ce!15101
| * Change to new GitLab Runner namedocs/gitlab-runnerAchilleas Pipinellis2017-10-3110-17/+17
| |
* | Merge branch '39704-fix-webhooks_log_time' into 'master'Stan Hu2017-11-025-3/+8
|\ \ | | | | | | | | | | | | | | | | | | Fix webhook recent deliveries elapsed time field Closes #39704 See merge request gitlab-org/gitlab-ce!15146
| * | Fix webhook recent deliveries elapsed time fieldAlexander Randa2017-11-025-3/+8
| | |
* | | Merge branch 'patch-28' into 'master'Douwe Maan2017-11-025-1/+66
|\ \ \ | | | | | | | | | | | | | | | | Add debugging section to testing_guide/best_practices.md. See merge request gitlab-org/gitlab-ce!14858
| * | | Address Douwe's feedbackRémy Coutable2017-11-023-3/+12
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Simplify the live debugger resume mechanism: press any keyRémy Coutable2017-10-262-14/+4
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Ensure no exception is raised if the Gitaly process is already gone in ↵Rémy Coutable2017-10-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | TestEnv.cleanup Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Improve the LiveDebugger exit handler and documentationRémy Coutable2017-10-172-11/+15
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Add LiveDebugger#live_debug to debug Capybara in feature tests.Rémy Coutable2017-10-164-20/+61
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Update best_practices.mdClement Ho2017-10-121-6/+11
| | | |
| * | | Add debugging section to testing_guide/best_practices.md.Fatih Acet2017-10-121-0/+14
| | | |
* | | | 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 page Closes #39512 See merge request gitlab-org/gitlab-ce!15137
| * | | | 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 links See merge request gitlab-org/gitlab-ce!15089
| * | | | | 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 mode See merge request gitlab-org/gitlab-ce!15124
| * | | | | | Fix binary files not showing anything in edit modemulti-file-editor-binary-editorPhil Hughes2017-11-012-6/+20
| | | | | | |
* | | | | | | Merge branch ↵Tim Zallmann2017-11-028-51/+55
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35955-searchable-settings-puts-expand-collapse-toggle-in-an-invalid-state' into 'master' Resolve "Searchable settings puts expand/collapse toggle in an invalid state." Closes #35955, #37520, and #39207 See merge request gitlab-org/gitlab-ce!13363
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.slack.com/archives/C0GQHHPGW/p1508253662000271
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated Vue to 2.5.1 See merge request gitlab-org/gitlab-ce!14874
| * | | | | | | | 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 translatable Closes #38592 See merge request gitlab-org/gitlab-ce!14915
| * | | | | | | | | 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_files Closes #39363 See merge request gitlab-org/gitlab-ce!15113
| * | | | | | | | 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 Runners Closes #33848 See merge request gitlab-org/gitlab-ce!15134
| * | | | | | | | 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 Auto DevOps graphic gears spinning based on physics Closes #39513 See merge request gitlab-org/gitlab-ce!15076
| * | | | | | | | Fix autodevops graphic gears spinning based on physics39513-fix-gears-spinning-physicallyEric Eastwood2017-10-302-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39513
* | | | | | | | | Merge branch 'fix-user-tab-activity-mobile' into 'master'Annabel Dunstone Gray2017-11-012-1/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed user profile tab being off-screen See merge request gitlab-org/gitlab-ce!15030
| * | | | | | | | | 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. See merge request gitlab-org/gitlab-ce!15139
| * | | | | | | | | | Move from doc to repo.dosire2017-11-011-6/+5
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'jlh-replace-cla' into 'master'Sid Sijbrandij2017-11-013-59/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CLA See merge request gitlab-org/gitlab-ce!15115
| * | | | | | | | | | 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 typo See merge request gitlab-org/gitlab-ce!15136
| * | | | | | | | | | 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 check See merge request gitlab-org/gitlab-ce!14785
| * | | | | | | | | | | Detect changes to LFS pointers for pruning and integrity checkJames Edwards-Jones2017-11-018-41/+313
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Git::Blob.batch_lfs_metadata can be used to check for LFS pointers. It uses a lazy enumorator and filters by blob size
* | | | | | | | | | | | Merge branch 'feature/plantuml-restructured-text-captions' into 'master'Douwe Maan2017-11-013-17/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-markup and PlantUML docs See merge request gitlab-org/gitlab-ce!15120
| * | | | | | | | | | | Update gitlab-markup and PlantUML docsMarkus Koller2017-11-013-17/+27
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |