Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/files/create_service.rb')
-rw-r--r--app/services/files/create_service.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/services/files/create_service.rb b/app/services/files/create_service.rb
index 853c471666d..270dc6471aa 100644
--- a/app/services/files/create_service.rb
+++ b/app/services/files/create_service.rb
@@ -10,8 +10,8 @@ module Files
update: false,
author_email: @author_email,
author_name: @author_name,
- source_project: @source_project,
- source_branch_name: @source_branch)
+ base_project: @base_project,
+ base_branch_name: @base_branch)
end
def validate
@@ -34,7 +34,7 @@ module Files
unless project.empty_repo?
@file_path.slice!(0) if @file_path.start_with?('/')
- blob = repository.blob_at_branch(@source_branch, @file_path)
+ blob = repository.blob_at_branch(@base_branch, @file_path)
if blob
raise_error('Your changes could not be committed because a file with the same name already exists')