diff options
| author | P.S.V.R <pmq2001@gmail.com> | 2016-04-18 10:39:07 +0300 |
|---|---|---|
| committer | P.S.V.R <pmq2001@gmail.com> | 2016-04-18 10:39:07 +0300 |
| commit | 3d6ba3b1076e68a67691d0e0de24ef97cc07f119 (patch) | |
| tree | 33b3169a49a26b01cfed23d5cd1bb29b748f8784 /app/models/commit.rb | |
| parent | e9f20f5922e9c365b4af14e53881a7bafba4139c (diff) | |
Add support to cherry-pick any commit
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785
Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index d1f07ccd55c..b406a4dd8d2 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -218,6 +218,10 @@ class Commit def revert_branch_name "revert-#{short_id}" end + + def cherry_pick_branch_name + project.repository.next_branch("cherry-pick-#{short_id}", mild: true) + end def revert_description if merged_merge_request @@ -253,6 +257,10 @@ class Commit end.any? { |commit_ref| commit_ref.reverts_commit?(self) } end + def change_type_title + merged_merge_request ? 'merge request' : 'commit' + end + private def repo_changes |