summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing empty line in #reset_cacheMatija Čupić2018-01-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move cache reset to ci_cd_settings controllerMatija Čupić2018-01-046-59/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cache_index to list of safe Project attributesMatija Čupić2017-12-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Project.cache_index in Build#cacheMatija Čupić2017-12-222-1/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement ResetProjectCacheServiceMatija Čupić2017-12-222-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove default value from cache_index migrationMatija Čupić2017-12-222-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cache_index migrationMatija Čupić2017-12-222-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2017-12-22524-6437/+7234
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix clear/reset wording in nav_controls_specMatija Čupić2017-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add reset cache button to pipelines viewMatija Čupić2017-12-215-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests for projects#reset_cacheMatija Čupić2017-12-212-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stub ResetProjectCacheServiceMatija Čupić2017-12-212-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stub out project#reset_cacheMatija Čupić2017-12-212-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update installation.md for 10.4.0.rc1LUKE BENNETT2018-01-061-2/+2
| |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix-ce-migration-timestamp' into 'master'Robert Speicher2018-01-063-7/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rebase commit SHA migration name See merge request gitlab-org/gitlab-ce!16256
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the EE `rebase_commit_sha` migration back in its original locationRobert Speicher2018-01-051-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rebase commit SHA migration namefix-ce-migration-timestampSean McGivern2018-01-052-7/+15
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This already existed in EE with a different timestamp, so rename for CE and make it idempotent.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sh-reuse-disk-repositories-seeder' into 'master'Stan Hu2018-01-051-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip project repository disk validation in development project seeder Closes gitlab-development-kit#310 See merge request gitlab-org/gitlab-ce!16257
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip project repository disk validation in development project seedersh-reuse-disk-repositories-seederStan Hu2018-01-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When seeding the GDK with new projects, it's very common to reuse the same repository names on disk. Previously, the validation would fail and leave the projects in a half-broken state. We can skip the validation to avoid causing odd errors. Closes gitlab-org/gitlab-development-kit#310
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'remove_labeled_issues_seed' into 'master'Sean McGivern2018-01-051-112/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove labeled issues seed See merge request gitlab-org/gitlab-ce!16258
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove labeled issues seedremove_labeled_issues_seedFelipe Artur2018-01-051-112/+0
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'gitaly-multi-action-prep' into 'master'Rémy Coutable2018-01-056-110/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move git operations for multi_action into Gitlab::Git Closes gitaly#872 See merge request gitlab-org/gitlab-ce!16215
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move git operations for multi_action into Gitlab::GitAlejandro RodrĂ­guez2018-01-056-110/+70
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix-cluster-migration-spec' into 'master'Robert Speicher2018-01-051-16/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent cluster migration spec from interfering with later specs See merge request gitlab-org/gitlab-ce!16255
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent cluster migration spec from interfering with later specsSean McGivern2018-01-051-16/+16
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a later spec tries to set a field that is added to any of these models by a later migration than the GCP clusters migration, it will fail because the model's columns are cached. We should always refer to models in migration specs by either their class in the migration, or the table directly, using the `table` helper.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2018-01-0516-1059/+9141
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of EE translations See merge request gitlab-org/gitlab-ce!16254
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master-i18n' into 'master'Douwe Maan2018-01-0516-1059/+9141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New Crowdin translations See merge request gitlab-org/gitlab-ee!3930
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'issue_40500' into 'master'Sean McGivern2018-01-055-13/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve filtering issues by label performance Closes #40500 and #37143 See merge request gitlab-org/gitlab-ce!16136
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve filtering issues by label performanceissue_40500Felipe Artur2018-01-055-13/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch ↔Filipa Lacerda2018-01-0517-53/+95
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41048-helpful-and-instructing-empty-state-for-multi-file-editor' into 'master' Resolve "Helpful and instructing Empty state for multi file editor" Closes #41048 and #41641 See merge request gitlab-org/gitlab-ce!16224
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Helpful and instructing Empty state for multi file editor"Tim Zallmann2018-01-0517-53/+95
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'dm-copy-mermaid-as-gfm' into 'master'Jacob Schatz2018-01-056-14/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy Mermaid graphs as GFM Closes #41211 See merge request gitlab-org/gitlab-ce!16046
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy Mermaid graphs as GFMdm-copy-mermaid-as-gfmDouwe Maan2018-01-056-14/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '40622-use-left-right-and-max-count' into 'master'Rémy Coutable2018-01-057-17/+141
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use --left-right and --max-count for counting diverging commits Closes #40622 et #37843 See merge request gitlab-org/gitlab-ce!15963
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use --left-right and --max-count for counting diverging commitsLin Jen-Shin (godfat)2018-01-057-17/+141
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ce-backport=reorder-issues' into 'master'Sean McGivern2018-01-0512-61/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport of reordering issues in epics See merge request gitlab-org/gitlab-ce!16247
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor matchers for background migrationsce-backport=reorder-issuesJarka Kadlecová2018-01-0511-55/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor RelativePositioning so that it can be used by other classesJarka Kadlecová2018-01-052-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '41563-fix-branch-creation-from-issue-in-firefox' into 'master'Fatih Acet2018-01-051-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix custom name in branch creation for issue in Firefox Closes #41563 See merge request gitlab-org/gitlab-ce!16244
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↔Fatih Acet2018-01-0560-349/+696
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41563-fix-branch-creation-from-issue-in-firefox
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix custom name in branch creation for issue in Firefox41563-fix-branch-creation-from-issue-in-firefoxEric Eastwood2018-01-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41563 `event.srcElement` is non-standard, https://developer.mozilla.org/en-US/docs/Web/API/Event/srcElement
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'issues/40986/get-participants-from-issues-mr-api' into 'master'Rémy Coutable2018-01-058-0/+149
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: get participants from merge_requests & issues Closes #40986 See merge request gitlab-org/gitlab-ce!16187
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: get participants from merge_requests & issuesBrent Greeff2018-01-058-0/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ac-autodevopfix-kubectl-version' into 'master'Kamil TrzciƄski2018-01-052-4/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Create secrets failed for Auto DevOps with latest stable of kubectl" Closes #41376 See merge request gitlab-org/gitlab-ce!16218
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport gitlab-org/gitlab-ci-yml!128 - Fix kubectl version to 1.8.6ac-autodevopfix-kubectl-versionAlessio Caiazza2018-01-042-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit extracts `kubectl`, `helm` and `codeclimate` versions as CI variables. `kubectl` changes from latest stable version to `1.8.6`, the other two are just extracted in order to be easily updated; now we can also test tool upgrades overriding CI secret variables.
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jprovazn-rebase' into 'master'Filipa Lacerda2018-01-0539-13/+820
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport 'Rebase' feature from EE to CE Closes #40301 See merge request gitlab-org/gitlab-ce!16071
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-0540-13/+825
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'remove-project-repo' into 'master'Sean McGivern2018-01-057-17/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the Project#repo method See merge request gitlab-org/gitlab-ce!16238
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix specsremove-project-repoJacob Vosmaer2018-01-055-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the Project#repo methodJacob Vosmaer2018-01-042-6/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |