summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add partial indexes on todos to handle users with many todosadd-indexes-to-todos-for-heavy-users-like-seanGreg Stark2018-03-093-1/+36
|
* Merge branch 'docs/ci-yaml-cleanup' into 'master'Achilleas Pipinellis2018-03-092-508/+460
|\ | | | | | | | | | | | | Cleanup and consolidate the CI yaml docs Closes #42914 and #18945 See merge request gitlab-org/gitlab-ce!17595
| * 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 lease See merge request gitlab-org/gitlab-ce!17500
| * | 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 migration See merge request gitlab-org/gitlab-ce!17599
| * | Reschedule commits_count background migrationjprovazn-commits-count-rescheduleJan Provaznik2018-03-095-2/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We still have >100K unmigrated MergeRequestDiffs which don't have commits_count set yet (see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17567#note_61904891) This migration re-schedules the original background migration. To assure that records are not processed twice, records with commits_count set are skipped. Related to #41698 and !17567
* | | Merge branch 'sh-make-add-index-idempotent' into 'master'Yorick Peterse2018-03-091-3/+4
|\ \ \ | | | | | | | | | | | | | | | | Fix index name to Rails default to ensure idempotency See merge request gitlab-org/gitlab-ce!17654
| * | | Fix index name to Rails default to ensure idempotencysh-make-add-index-idempotentStan Hu2018-03-081-3/+4
| | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-com/infrastructure/issues/3822
* | | | Merge branch 'patch-28-docs' into 'master'Filipa Lacerda2018-03-091-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixing sentence about getting help page See merge request gitlab-org/gitlab-ce!17643
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add ~"Next Patch Release" as a priority label" Closes #43872 See merge request gitlab-org/gitlab-ce!17525
| * | | | | 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 GitLab Closes #43948 See merge request gitlab-org/gitlab-ce!17577
| * | | | | | 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. Closes #39115 See merge request gitlab-org/gitlab-ce!17309
| * | | | | | 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 it See merge request gitlab-org/gitlab-ce!17638
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dont show remove source branch checkbox when user cannot remove the branch Closes #33264 See merge request gitlab-org/gitlab-ce!17642
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #33264
* | | | | | | Merge branch 'cache-refactor' into 'master'Sean McGivern2018-03-0912-216/+313
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache `#can_be_resolved_in_ui?` git operations Closes gitaly#1051 See merge request gitlab-org/gitlab-ce!17589
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Foreground verification of job artifacts" Closes #43949 See merge request gitlab-org/gitlab-ce!17578
| * | | | | | | | 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 discussions See merge request gitlab-org/gitlab-ce!17653
| * | | | | | | | | Correct permissions for locking discussionsVictor Wu2018-03-091-1/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch '43259-document-persistent-images-for-autodevops-deployments' ↵Achilleas Pipinellis2018-03-091-0/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add a note about persistent images for auto devops deployments Closes #43259 See merge request gitlab-org/gitlab-ce!17338
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Add `Gitlab.rails5?` method See merge request gitlab-org/gitlab-ce!17660
| * | | | | | | | 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' mandatory See merge request gitlab-org/gitlab-ce!17648
| * | | | | | | | 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 content See merge request gitlab-org/gitlab-ce!17650
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""You can also press Ctrl-Enter" tooltip lingers after Tab+Enter" Closes #37211 See merge request gitlab-org/gitlab-ce!17560
| * | | | | | | | Hide hotkey tooltip after click event in diff comments37211-diff-comments-fix-ctrl-enter-tooltipDennis Tang2018-03-061-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'docs-update-table-tiers-boards' into 'master'Achilleas Pipinellis2018-03-081-0/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs update table tiers boards See merge request gitlab-org/gitlab-ce!17651
| * | | | | | | | | Docs update table tiers boardsVictor Wu2018-03-081-0/+11
|/ / / / / / / / /
* | | | | | | | | Merge branch 'refactor/move-mr-widget-memory-usage-and-graph-components' ↵Phil Hughes2018-03-086-93/+89
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Move MemoryGraph and MemoryUsage vue components See merge request gitlab-org/gitlab-ce!17533
| * | | | | | | | | Move MemoryGraph and MemoryUsage vue componentsGeorge Tsiolis2018-03-086-93/+89
| | | | | | | | | |
* | | | | | | | | | Update CHANGELOG.md for 10.5.4osw-44052-single-batch-blob-request-to-gitaly-on-discussionsIan Baum2018-03-0813-61/+21
| |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'jivl-fix-delete-milestone-button-showing-up' into 'master'Phil Hughes2018-03-082-10/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix delete milestone button showing up for all users Closes #43778 See merge request gitlab-org/gitlab-ce!17576
| * | | | | | | | | Fix milestone delete button showing for all usersjivl-fix-delete-milestone-button-showing-upJose Ivan Vargas2018-03-062-10/+21
| | | | | | | | | |
* | | | | | | | | | Merge branch 'docs-vue-templates' into 'master'Filipa Lacerda2018-03-081-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename VUE JS to Vue See merge request gitlab-org/gitlab-ce!17649
| * | | | | | | | | | Rename VUE JS to Vuedocs-vue-templatesClement Ho2018-03-081-1/+1
| | | | | | | | | | |
View Lorry Controller Status