summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'fl-updat-svg-dependency' into 'master'Clement Ho2018-03-082-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates svg dependency See merge request gitlab-org/gitlab-ce!17645
| | * | | | | | | | | | | | | | | | Updates svg dependencyfl-updat-svg-dependencyFilipa Lacerda2018-03-082-4/+4
| | | |_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'sh-fix-update-service' into 'master'James Lopez2018-03-082-1/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when updating a project Closes #44019 See merge request gitlab-org/gitlab-ce!17647
| | * | | | | | | | | | | | | | | | Fix Error 500 when updating a projectsh-fix-update-serviceStan Hu2018-03-082-1/+10
| | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If no parameters were specified for project features but Wikis were disabled, we would get "NoMethodError: undefined method `[]' for nil:NilClass". Closes #44019
| * | | | | | | | | | | | | | | | Merge branch 'update-templates-and-dependencies-10-6' into 'master'Robert Speicher2018-03-087-200/+357
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update templates and licenses See merge request gitlab-org/gitlab-ce!17637
| | * | | | | | | | | | | | | | | | Update templates and licensesupdate-templates-and-dependencies-10-6James Lopez2018-03-087-200/+357
| | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'update-guides-10-6' into 'master'Robert Speicher2018-03-082-2/+363
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update guides for 10.6 See merge request gitlab-org/gitlab-ce!17635
| | * | | | | | | | | | | | | | | update guides for 10.6update-guides-10-6James Lopez2018-03-082-2/+363
| | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch 'gitlab-git-duplicate-code' into 'master'Sean McGivern2018-03-081-18/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate method definitions See merge request gitlab-org/gitlab-ce!17478
| | * | | | | | | | | | | | | | | Remove duplicate method definitionsJacob Vosmaer2018-03-081-18/+0
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch '40525-listing-user-activity-timeouts' into 'master'Yorick Peterse2018-03-084-9/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve database response time for listing user activity Closes #40525 See merge request gitlab-org/gitlab-ce!17454
| | * | | | | | | | | | | | | | | | Leverage user_contributed_projects to find recent events.40525-listing-user-activity-timeoutsAndreas Brandl2018-03-074-9/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #40525.
| * | | | | | | | | | | | | | | | | Merge branch 'jprovazn-revert-commit-cleanup' into 'master'Sean McGivern2018-03-088-17/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Cleanup after adding MR diff's commit_count" See merge request gitlab-org/gitlab-ce!17639
| | * | | | | | | | | | | | | | | | | Revert "Cleanup after adding MR diff's commit_count"Jan Provaznik2018-03-088-17/+6
| | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0b7d10851456018328da137beeca931767b4fd0a.
| * | | | | | | | | | | | | | | | | Merge branch '43802-ensure-foreign-keys-on-clusters-applications' into 'master'Yorick Peterse2018-03-083-0/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add missing foreign key constraint in clusters_applications_ingress" Closes #43802 See merge request gitlab-org/gitlab-ce!17488
| | * | | | | | | | | | | | | | | | | Ensure orphaned rows are deleted before adding the foreign key43802-ensure-foreign-keys-on-clusters-applicationsMayra Cabrera2018-03-072-2/+18
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Ensure foreign keys on Clusters ApplicationsMayra Cabrera2018-03-073-0/+41
| | | |_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #43802
| * | | | | | | | | | | | | | | | | Merge branch 'ce-rubocop-naming-filename' into 'master'Nick Thomas2018-03-0828-147/+224
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Add Naming/FileName rule checking expected class/module per filename See merge request gitlab-org/gitlab-ce!17631