diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-06-19 17:55:02 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-06-20 09:11:55 +0200 |
| commit | 46b56b18f5bf94662a8500e2b8789f504b5d6ea8 (patch) | |
| tree | ebb5ed5636a4998e7750ff2c6592309bc94732d5 /app/models/repository.rb | |
| parent | 38edd5c33e5d88a950ee13809240260cb78568fc (diff) | |
| download | gitlab-ce-46b56b18f5bf94662a8500e2b8789f504b5d6ea8.tar.gz | |
Move mergablility check to Gitalyzj-can-be-merged
Closes https://gitlab.com/gitlab-org/gitaly/issues/889
Diffstat (limited to 'app/models/repository.rb')
| -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 e4202505634..de889d18729 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -847,7 +847,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 |