summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'improve-queue-background-migration' of gitlab.com:gitlab-org/gi...improve-queue-background-migrationShinya Maeda2018-06-141-3/+4
|\
| * Improve resillency of queue_background_migration on large tablesKamil Trzciński2018-06-132-19/+45
* | Merge branch 'master' into improve-queue-background-migrationShinya Maeda2018-06-14366-1414/+3363
|\ \
| * \ Merge branch 'winh-new-branch-url-encode' into 'master'Mike Greiling2018-06-133-16/+107
| |\ \
| | * | Fix branch name encoding for dropdown on issue pageWinnie Hellmann2018-06-133-16/+107
| |/ /
| * | Merge branch 'jivl-remove-remaining-btn-xs-class-usage' into 'master'Annabel Gray2018-06-138-23/+5
| |\ \
| | * | Remove the btn-xs class from the stylesheetsJose2018-06-138-23/+5
| * | | Merge branch '47830-merge-request-diff-loading-icon-not-visible' into 'master'Annabel Gray2018-06-131-1/+1
| |\ \ \
| | * | | Fix loading icon for mr tabsClement Ho2018-06-131-1/+1
| * | | | Merge branch 'jivl-fix-repository-instruction-wrapping-text' into 'master'Clement Ho2018-06-131-4/+4
| |\ \ \ \
| | * | | | Remove card class from the git-empty containersJose2018-06-131-4/+4
| | |/ / /
| * | | | Merge branch 'unify-parallel_importer' into 'master'Stan Hu2018-06-131-0/+9
| |\ \ \ \
| | * | | | Bring changes from EE for parallel_importer.rbLin Jen-Shin2018-06-141-0/+9
| * | | | | Merge branch 'rosulk-patch-12' into 'master'Clement Ho2018-06-132-5/+11
| |\ \ \ \ \
| | * | | | | Flex board columnsPaul Slaughter2018-06-132-5/+11
| |/ / / / /
| * | | | | Merge branch 'bvl-missing-message-on-access-denied' into 'master'Robert Speicher2018-06-134-3/+22
| |\ \ \ \ \
| | * | | | | Render access denied without messageBob Van Landuyt2018-06-134-3/+22
| * | | | | | Merge branch 'mk/rake-task-verify-remote-files' into 'master'Stan Hu2018-06-1310-41/+147
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Add support for verifying remote uploads, artifacts, and LFS objects in check...Michael Kozono2018-06-1310-41/+147
| |/ / / / /
| * | | | | Merge branch 'qa-clear-session-only-if-block-given-and-no-errors' into 'master'Rémy Coutable2018-06-131-13/+1
| |\ \ \ \ \
| | * | | | | Only clear the sessions if block_given? and no errorLin Jen-Shin2018-06-131-13/+1
| * | | | | | Merge branch 'ab-document-migration-needs-changelog' into 'master'Yorick Peterse2018-06-131-0/+2
| |\ \ \ \ \ \
| | * | | | | | Database migrations should have a changelog entry.Andreas Brandl2018-06-131-0/+2
| |/ / / / / /
| * | | | | | Merge branch 'gl-remove-window-scope' into 'master'Phil Hughes2018-06-136-56/+41
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into gl-remove-window-scopeFilipa Lacerda2018-06-13261-1105/+1399
| | |\ \ \ \ \ \
| | * | | | | | | Removes merge conflicts vue code from globalnamespaceFilipa Lacerda2018-06-136-57/+42
| * | | | | | | | Merge branch 'fix-ux-handbook-link' into 'master'Stan Hu2018-06-131-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Fix UX handbook link in contribution guideAndreas Kämmerle2018-06-131-1/+1
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'zj-empty-batch-no-rpc' into 'master'Rémy Coutable2018-06-132-0/+12
| |\ \ \ \ \ \ \
| | * | | | | | | ListCommitByOid isn't called with an empty batchZeger-Jan van de Weg2018-06-132-0/+12
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'fj-use-gitaly-0-105-1' into 'master'Douwe Maan2018-06-131-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Use Gitaly 0.105.1Francisco Javier López2018-06-131-1/+1
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch '47823-fix-issue-boards-label-list-creation' into 'master'Phil Hughes2018-06-131-1/+2
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Add missing `entityType`Kushal Pandya2018-06-131-1/+2
| * | | | | | | Merge branch 'docs-coached-20180610-1' into 'master'Achilleas Pipinellis2018-06-131-31/+116
| |\ \ \ \ \ \ \
| | * | | | | | | resolving MR 19611-fix/enhance start-using-git docEdwin Torres2018-06-131-31/+116
| |/ / / / / / /
| * | | | | | | Merge branch '47501-link-scroll' into 'master'Clement Ho2018-06-135-26/+23
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Resolve "Scrolling tabs are broken on profile, activity, and projects"Simon Knox2018-06-135-26/+23
| |/ / / / / /
| * | | | | | Merge branch 'doc-add-overview-of-frontend-testing' into 'master'Tim Zallmann2018-06-131-2/+134
| |\ \ \ \ \ \
| | * | | | | | Add documentation: Overview of Frontend TestingAndré Luís2018-06-131-2/+134
| |/ / / / / /
| * | | | | | Merge branch 'sql-buckets' into 'master'Stan Hu2018-06-133-2/+7
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Adjust SQL and transaction Prometheus bucketssql-bucketsYorick Peterse2018-06-113-2/+7
| * | | | | | Merge branch '47145-quick-actions-confidential' into 'master'Rémy Coutable2018-06-135-0/+71
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Resolve "Add `/confidential` quick action for issues"Jan2018-06-135-0/+71
| |/ / / / /
| * | | | | Merge branch 'blackst0ne-rails5-fix-storage-counter-helper' into 'master'Rémy Coutable2018-06-131-10/+14
| |\ \ \ \ \
| | * | | | | [Rails5] Fix `storage_counter` helperblackst0ne2018-06-131-10/+14
| * | | | | | Merge branch 'add-documentation-to-freeze' into 'master'Marin Jankovski2018-06-131-0/+1
| |\ \ \ \ \ \
| | * | | | | | Documentation does not need an exception to be pickedSean McGivern2018-06-131-0/+1
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'fl-eslint-vue-house-keeping' into 'master'Tim Zallmann2018-06-13248-1087/+1165
| |\ \ \ \ \ \
| | * | | | | | Fix broken tests due to bad conflict resolutionFilipa Lacerda2018-06-133-3/+3