diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-01-06 22:05:30 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-01-06 22:05:30 +0800 |
| commit | a4b97b2cb61c03d08e25cf2cd7fcbb3f21611350 (patch) | |
| tree | 5d19444b07a143eb6cac69f5a64f41792455e40d /app/services/files/create_service.rb | |
| parent | 593228ffe3b2e4ff82c4d63e5d5c59b835f70085 (diff) | |
| download | gitlab-ce-a4b97b2cb61c03d08e25cf2cd7fcbb3f21611350.tar.gz | |
Rename source to base to avoid confusion from MR
Diffstat (limited to 'app/services/files/create_service.rb')
| -rw-r--r-- | app/services/files/create_service.rb | 6 |
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') |