summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix removes source branch text being rendered in merged stateremoves-source-branch-widget-statePhil Hughes2018-03-124-1/+40
|
* Merge branch 'remove-jquery-globals' into 'master'Phil Hughes2018-03-12289-20/+386
|\ | | | | | | | | Require jQuery to be explicitly imported See merge request gitlab-org/gitlab-ce!17674
| * require jQuery to be explicitly importedremove-jquery-globalsMike Greiling2018-03-09289-20/+386
| |
* | Merge branch '43702-update-label-dropdown-wording' into 'master'Phil Hughes2018-03-1217-24/+244
|\ \ | | | | | | | | | | | | | | | | | | Update wording to specify create/manage project vs group labels in labels dropdown Closes #43702 See merge request gitlab-org/gitlab-ce!17640
| * | Add changelog entry43702-update-label-dropdown-wordingKushal Pandya2018-03-121-0/+5
| | |
| * | Update test for change in label dropdown action nameKushal Pandya2018-03-125-11/+11
| | |
| * | Add `createLabelTitle` & `manageLabelsTitle` props for action stringKushal Pandya2018-03-122-5/+43
| | |
| * | Add `headerTitle` prop for container header stringKushal Pandya2018-03-122-4/+23
| | |
| * | Add `isProject` and computed props to for contextual info for dropdownKushal Pandya2018-03-122-0/+50
| | |
| * | Add `isProject` mock configKushal Pandya2018-03-121-0/+1
| | |
| * | Use label dropdown helper for rendering contextual stringKushal Pandya2018-03-122-4/+6
| | |
| * | Add helpers for labels dropdownKushal Pandya2018-03-122-0/+105
| | |
* | | Merge branch 'fl-remove-duplicated-code' into 'master'Phil Hughes2018-03-121-14/+0
|\ \ \ | |/ / |/| | | | | | | | Removes duplicated & non used code See merge request gitlab-org/gitlab-ce!17667
| * | Removes duplicated & non used codefl-remove-duplicated-codeFilipa Lacerda2018-03-091-14/+0
| | |
* | | Merge branch 'remove-svg-sync-script' into 'master'Clement Ho2018-03-0975-121/+10
|\ \ \ | | | | | | | | | | | | | | | | Remove sync script for gitlab-svgs and reference the vendored library directly See merge request gitlab-org/gitlab-ce!17656
| * | | 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 component See merge request gitlab-org/gitlab-ce!17397
| * | 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 RSpec See merge request gitlab-org/gitlab-ce!17511
| * | | Move project fork spinach tests to RSpecSemyon Pupkov2018-03-053-134/+104
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | Merge branch 'project-active-tab-rspec' into 'master'Douwe Maan2018-03-093-265/+137
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move project active tab spinach tests to RSpec See merge request gitlab-org/gitlab-ce!17628
| * | | | Move project active tab spinach tests to RSpecSemyon Pupkov2018-03-083-265/+137
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | | Merge branch 'ce-5194-fix-github-ci-cd-github-auth-missing-query-param' into ↵Douwe Maan2018-03-091-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 'master' Add `?ci_cd_only=true` query parameter to CI/CD GitHub status link -- CE backport See merge request gitlab-org/gitlab-ce!17661
| * | | | 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
| | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4914
* | | | | 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 diffs Closes #43951 See merge request gitlab-org/gitlab-ce!17659
| * | | | | 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 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
View Lorry Controller Status