summaryrefslogtreecommitdiff
path: root/app/models/repository.rb
diff options
context:
space:
mode:
authormicael.bergeron <micaelbergeron@gmail.com>2017-11-01 10:31:35 -0400
committermicael.bergeron <micaelbergeron@gmail.com>2017-11-03 08:13:11 -0400
commitcd88fa8f80710ec977a85ab8701570073c94f017 (patch)
tree8866f616741d7a3f7f35f6e37b2e01503804b2a2 /app/models/repository.rb
parent8c01f3110c8d8601fc16b17850dfa778f1f3d877 (diff)
downloadgitlab-ce-cd88fa8f80710ec977a85ab8701570073c94f017.tar.gz
removed the #ensure_ref_fetched from all controllers
also, I refactored the MergeRequest#fetch_ref method to express the side-effect that this method has. MergeRequest#fetch_ref -> MergeRequest#fetch_ref! Repository#fetch_source_branch -> Repository#fetch_source_branch!
Diffstat (limited to 'app/models/repository.rb')
-rw-r--r--app/models/repository.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 44a1e9ce529..3b6285f786d 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -982,8 +982,8 @@ class Repository
gitlab_shell.fetch_remote(raw_repository, remote, forced: forced, no_tags: no_tags)
end
- def fetch_source_branch(source_repository, source_branch, local_ref)
- raw_repository.fetch_source_branch(source_repository.raw_repository, source_branch, local_ref)
+ def fetch_source_branch!(source_repository, source_branch, local_ref)
+ raw_repository.fetch_source_branch!(source_repository.raw_repository, source_branch, local_ref)
end
def compare_source_branch(target_branch_name, source_repository, source_branch_name, straight:)