summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into '44453-performance-bar-modalbox'44453-performance-bar-modalboxPhil Hughes2018-03-22217-1250/+2795
|\
| * Merge branch 'move-email-footer-info-to-single-line' into 'master'Filipa Lacerda2018-03-222-7/+8
| |\
| | * Move email footer info to a single linemove-email-footer-info-to-single-lineEric Eastwood2018-03-212-7/+8
| * | Merge branch 'performance-bar-position-fix' into 'master'Filipa Lacerda2018-03-228-59/+61
| |\ \
| | * | fixed karmaperformance-bar-position-fixPhil Hughes2018-03-211-10/+2
| | * | removed check for hostPhil Hughes2018-03-214-35/+27
| | * | Fix performance bar spacingPhil Hughes2018-03-215-16/+34
| * | | Merge branch 'sh-fix-readonly-reload' into 'master'Sean McGivern2018-03-221-1/+1
| |\ \ \
| | * | | Fix "A copy of Gitlab::Middleware::Readonly has been removed from the module ...Stan Hu2018-03-211-1/+1
| * | | | Merge branch 'jej/omniauth-initializer-refactor' into 'master'Douwe Maan2018-03-223-45/+141
| |\ \ \ \
| | * | | | OmniauthInitializer refactoringjej/omniauth-initializer-refactorJames Edwards-Jones2018-03-221-33/+31
| | * | | | Omniauth callbacks moved to methodsJames Edwards-Jones2018-03-201-26/+38
| | * | | | OmniauthInitializer created to improve devise.rbJames Edwards-Jones2018-03-203-45/+131
| * | | | | Update VERSION to 10.7.0-prev10.7.0.preJames Lopez2018-03-221-1/+1
| * | | | | Update CHANGELOG.md for 10.6.0James Lopez2018-03-22151-749/+184
| | |/ / / | |/| | |
| * | | | Merge branch 'add-query-counts-to-profiler-output' into 'master'Stan Hu2018-03-223-6/+35
| |\ \ \ \
| | * | | | Add query counts by model to profiler outputadd-query-counts-to-profiler-outputSean McGivern2018-03-213-6/+35
| * | | | | Merge remote-tracking branch 'dev/master'Robert Speicher2018-03-211-0/+25
| |\ \ \ \ \
| | * | | | | Update CHANGELOG.md for 10.5.6Mark Fletcher2018-03-161-0/+8
| | * | | | | Update CHANGELOG.md for 10.4.6Mark Fletcher2018-03-161-0/+8
| | * | | | | Update CHANGELOG.md for 10.3.9Mark Fletcher2018-03-161-0/+9
| * | | | | | Merge branch 'disable-btn-mr-when-posting-comment' into 'master'Fatih Acet2018-03-212-2/+17
| |\ \ \ \ \ \
| | * | | | | | Adds testsJacob Schatz2018-03-211-0/+14
| | * | | | | | Disables the button when submitting comment.Jacob Schatz2018-03-211-2/+3
| * | | | | | | Merge branch 'docs/ci-caching' into 'master'Marcia Ramos2018-03-214-86/+569
| |\ \ \ \ \ \ \
| | * | | | | | | Gather info on CI/CD cachingAchilleas Pipinellis2018-03-214-86/+569
| * | | | | | | | Merge branch 'refactor/move-time-tracking-vue-components' into 'master'Filipa Lacerda2018-03-214-98/+109
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Move TimeTrackingCollapsedState vue componentGeorge Tsiolis2018-03-214-98/+109
| * | | | | | | | | Merge branch 'docs/clarify-mail-room-procfile-location' into 'master'Sean McGivern2018-03-212-9/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Launch mail_room manually and remove foreman referenceEric Eastwood2018-03-212-9/+2
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'update-omniauth' into 'master'Robert Speicher2018-03-212-4/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update omniauth 1.4.2 -> 1.8Pirate Praveen2018-03-212-4/+4
| * | | | | | | | | | Merge branch 'ee-5063-to-ce-backport' into 'master'Douwe Maan2018-03-213-5/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Backports changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_reque...ee-5063-to-ce-backportTiago Botelho2018-03-213-5/+5
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'blackst0ne-rails5-add-second-gemfile' into 'master'Robert Speicher2018-03-213-5/+1255
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | [Rails5] Add Gemfile.rails5blackst0ne-rails5-add-second-gemfileblackst0ne2018-03-153-5/+1255
| * | | | | | | | | | Merge branch '43786-on-the-issuable-list-add-tooltips-to-icons' into 'master'Clement Ho2018-03-215-11/+25
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Issuable list: add tooltips to iconsLukas Eipert2018-03-215-11/+25
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'ide-folder-button-path' into 'master'Tim Zallmann2018-03-217-46/+95
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixes the web IDE link in tree list opening the wrong URLPhil Hughes2018-03-217-46/+95
| * | | | | | | | | | | Merge branch 'blackst0ne-rails5-update-ar5-batching-initializer' into 'master'Robert Speicher2018-03-211-37/+35
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | [Rails5] Update ar5_batching initializerblackst0ne-rails5-update-ar5-batching-initializerblackst0ne2018-03-211-37/+35
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'blackst0ne-rails5-update-ar5-pg-10-support-initializer' into 'm...Robert Speicher2018-03-211-3/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | [Rails5] Update ar5_pg_10_support initializerblackst0ne-rails5-update-ar5-pg-10-support-initializerblackst0ne2018-03-211-3/+2
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge branch 'remove-parser-warnings-workaround' into 'master'Robert Speicher2018-03-211-9/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | It's now updated so we could remove itLin Jen-Shin2018-03-211-9/+0
| * | | | | | | | | | | Merge branch 'gitaly-upload-archive' into 'master'Sean McGivern2018-03-213-2/+8
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Send Gitaly payload for git-upload-archive SSH commandsAlejandro Rodríguez2018-03-213-2/+8
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge branch 'ab-44446-add-indexes-for-user-activity-queries' into 'master'Yorick Peterse2018-03-213-1/+48
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Guard creation/removal with existence checks.Andreas Brandl2018-03-211-6/+16