diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-01 18:13:56 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-01 18:13:56 +0000 |
| commit | 1769b59b9fd05325e3016b1a53a82ae6cf56adb5 (patch) | |
| tree | a7e81e0c94fce5cc033e802d53d0c08d833fc87d /app/models/repository.rb | |
| parent | 05003789d95f2f5d28a2f018d9e1b51ad7ab983c (diff) | |
| download | gitlab-ce-1769b59b9fd05325e3016b1a53a82ae6cf56adb5.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index e675f604b0a..b23b9486cfe 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -829,12 +829,6 @@ class Repository end end - def merge_to_ref(user, source_sha, merge_request, target_ref, message, first_parent_ref, allow_conflicts = false) - branch = merge_request.target_branch - - raw.merge_to_ref(user, source_sha, branch, target_ref, message, first_parent_ref, allow_conflicts) - end - def delete_refs(*ref_names) raw.delete_refs(*ref_names) end |