summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove sync script for gitlab-svgs and reference the vendored library directlyMike Greiling2018-03-0975-121/+10
* Merge branch 'refactor/move-assignee-title-vue-component' into 'master'Clement Ho2018-03-096-62/+72
|\
| * Move AssigneeTitle vue componentGeorge Tsiolis2018-03-096-62/+72
* | Merge branch 'move-project-fork-to-rspec' into 'master'Douwe Maan2018-03-093-134/+104
|\ \
| * | Move project fork spinach tests to RSpecSemyon Pupkov2018-03-053-134/+104
* | | Merge branch 'project-active-tab-rspec' into 'master'Douwe Maan2018-03-093-265/+137
|\ \ \
| * | | Move project active tab spinach tests to RSpecSemyon Pupkov2018-03-083-265/+137
* | | | Merge branch 'ce-5194-fix-github-ci-cd-github-auth-missing-query-param' into ...Douwe Maan2018-03-091-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Backport fix new GitHub CI/CD page redirecting to import GitHub status pagece-5194-fix-github-ci-cd-github-auth-missing-query-paramEric Eastwood2018-03-081-1/+1
* | | | Merge branch 'osw-43951-single-batch-blob-request-to-gitaly' into 'master'Sean McGivern2018-03-092-8/+15
|\ \ \ \
| * | | | Submit a single batch blob RPC to Gitaly per HTTP request when viewing diffsOswaldo Ferreira2018-03-092-8/+15
* | | | | Merge branch 'docs/ci-yaml-cleanup' into 'master'Achilleas Pipinellis2018-03-092-508/+460
|\ \ \ \ \
| * | | | | Cleanup and consolidate the CI yaml docsdocs/ci-yaml-cleanupAchilleas Pipinellis2018-03-072-508/+460
* | | | | | Merge branch 'gitlab-ee-4910-exclusive-lease' into 'master'Nick Thomas2018-03-094-0/+59
|\ \ \ \ \ \
| * | | | | | Add rake task to cleanup any existing exclusive leaseGabriel Mazetto2018-03-094-0/+59
|/ / / / / /
* | | | | | Merge branch 'jprovazn-commits-count-reschedule' into 'master'Yorick Peterse2018-03-095-2/+81
|\ \ \ \ \ \
| * | | | | | Reschedule commits_count background migrationjprovazn-commits-count-rescheduleJan Provaznik2018-03-095-2/+81
* | | | | | | Merge branch 'sh-make-add-index-idempotent' into 'master'Yorick Peterse2018-03-091-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Fix index name to Rails default to ensure idempotencysh-make-add-index-idempotentStan Hu2018-03-081-3/+4
* | | | | | | | Merge branch 'patch-28-docs' into 'master'Filipa Lacerda2018-03-091-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixing sentence about getting help pagepatch-28-docsFabien Catteau2018-03-081-2/+2
* | | | | | | | | Merge branch '43872-add-next-patch-release-as-a-priority-label' into 'master'Sean McGivern2018-03-091-3/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update CONTRIBUTING.md43872-add-next-patch-release-as-a-priority-labelFabio Busatto2018-03-051-1/+2
| * | | | | | | | | Update CONTRIBUTING.mdFabio Busatto2018-03-051-4/+11
* | | | | | | | | | Merge branch 'docs-article-devops-gamedev' into 'master'Achilleas Pipinellis2018-03-095-6/+536
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Docs: new article devops + game dev with GitLabMarcia Ramos2018-03-095-6/+536
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'dm-project-group-share-docs' into 'master'Achilleas Pipinellis2018-03-091-7/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Clarify what groups projects can be shared with.Douwe Maan2018-03-091-7/+17
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs/trigger-script' into 'master'Sean McGivern2018-03-091-5/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Wait for the pipeline to start before canceling itdocs/trigger-scriptAchilleas Pipinellis2018-03-081-5/+14
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'merge-request-widget-source-branch-improvements' into 'master'Filipa Lacerda2018-03-098-12/+123
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | use toEqual instead of toBeFalsy/TruthyPhil Hughes2018-03-091-3/+3
| * | | | | | | | | | added rspec test to test when user cant mergemerge-request-widget-source-branch-improvementsPhil Hughes2018-03-081-0/+24
| * | | | | | | | | | Dont show remove source branch checkbox when user cannot remove the branchPhil Hughes2018-03-088-12/+99
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'cache-refactor' into 'master'Sean McGivern2018-03-0912-216/+313
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Cache `#can_be_resolved_in_ui?` git operationscache-refactorAlejandro Rodríguez2018-03-086-14/+86
| * | | | | | | | | | Refactor RepositoryCache to make it usable in other classesAlejandro Rodríguez2018-03-067-178/+203
* | | | | | | | | | | Merge branch '43949-verify-job-artifacts' into 'master'Sean McGivern2018-03-097-0/+119
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Implement foreground verification of CI artifacts43949-verify-job-artifactsNick Thomas2018-03-077-0/+119
* | | | | | | | | | | | Merge branch 'docs-correct-permissions-for-lock-discussions' into 'master'Achilleas Pipinellis2018-03-091-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Correct permissions for locking discussionsVictor Wu2018-03-091-1/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch '43259-document-persistent-images-for-autodevops-deployments' in...Achilleas Pipinellis2018-03-091-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add a note about persistent images for auto devops deploymentsMayra Cabrera2018-03-091-0/+12
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'blackst0ne-add-rails5-method' into 'master'Dmitriy Zaporozhets2018-03-091-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add Gitlab.rails5? methodblackst0ne-add-rails5-methodblackst0ne2018-03-091-0/+6
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'gitaly-fsck-mandatory' into 'master'Douwe Maan2018-03-081-16/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make 'git fsck' mandatorygitaly-fsck-mandatoryKim "BKC" Carlbäcker2018-03-081-16/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'fl-svg' into 'master'Clement Ho2018-03-0817-3/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update svgs contentfl-svgFilipa Lacerda2018-03-0817-3/+17
* | | | | | | | | | | | Merge branch '37211-diff-comments-fix-ctrl-enter-tooltip' into 'master'Fatih Acet2018-03-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |