diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-20 12:24:42 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-20 12:24:42 -0500 |
| commit | a45924348fca7eff4e26b3d9e47117b9fb3669ec (patch) | |
| tree | 17531b97fd4a26e4f530dc5d35c2962fc0ed4f06 /app/models/merge_request.rb | |
| parent | b41ddf9c6977e311b5085de8467ab450aa81b71b (diff) | |
| parent | 832cdd3d516698d0e6a7257b3d94292819a0436a (diff) | |
| download | gitlab-ce-a45924348fca7eff4e26b3d9e47117b9fb3669ec.tar.gz | |
Merge remote-tracking branch 'origin/master' into issue_14904
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index e410febdfff..dbecc48485c 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -27,9 +27,6 @@ # merge_commit_sha :string # -require Rails.root.join("app/models/commit") -require Rails.root.join("lib/static_model") - class MergeRequest < ActiveRecord::Base include InternalId include Issuable @@ -605,4 +602,8 @@ class MergeRequest < ActiveRecord::Base def can_be_reverted?(current_user = nil) merge_commit && !merge_commit.has_been_reverted?(current_user, self) end + + def can_be_cherry_picked? + merge_commit + end end |