diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-31 11:02:09 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-31 11:02:09 +0000 |
| commit | dacd9dbef4b245f7da5640e3638eae05e9678992 (patch) | |
| tree | ed8b933ce74c61972ae1cbcecf3aee538b3468ed /app | |
| parent | f8250f8fd0cfec10a639b8a010331197a9e1c40e (diff) | |
| parent | 11191f938c3b865dbb3e203ecdb018fd91bd0c91 (diff) | |
| download | gitlab-ce-dacd9dbef4b245f7da5640e3638eae05e9678992.tar.gz | |
Merge branch 'fix/move-can-be-merged-to-lib-git' into 'master'
Move Repository#can_be_merged? to Gitlab::Git::Repository
Closes #42544
See merge request gitlab-org/gitlab-ce!16771
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 6c776301ac2..406e3a7f73b 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -852,7 +852,7 @@ class Repository @root_ref_sha ||= commit(root_ref).sha end - delegate :merged_branch_names, to: :raw_repository + delegate :merged_branch_names, :can_be_merged?, to: :raw_repository def merge_base(first_commit_id, second_commit_id) first_commit_id = commit(first_commit_id).try(:id) || first_commit_id |