diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-20 14:15:28 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-20 14:15:28 +0000 |
| commit | a5245fd8b842c0d87161254cfa6ef257f9d22ed9 (patch) | |
| tree | 138e170b7956476b75f8938f7817e2a4192f81e8 /app | |
| parent | 00518d261d2e5b751bb5da93531880d4b3eb4250 (diff) | |
| parent | 46b56b18f5bf94662a8500e2b8789f504b5d6ea8 (diff) | |
| download | gitlab-ce-a5245fd8b842c0d87161254cfa6ef257f9d22ed9.tar.gz | |
Merge branch 'zj-can-be-merged' into 'master'
Move mergablility check to Gitaly
Closes gitaly#889
See merge request gitlab-org/gitlab-ce!20019
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index c2f62badbcb..3089d0162ee 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -850,7 +850,7 @@ class Repository @root_ref_sha ||= commit(root_ref).sha end - delegate :merged_branch_names, :can_be_merged?, to: :raw_repository + delegate :merged_branch_names, to: :raw_repository def merge_base(first_commit_id, second_commit_id) first_commit_id = commit(first_commit_id).try(:id) || first_commit_id |