diff options
| author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-08-24 14:30:39 +0100 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-09-09 23:05:30 -0400 |
| commit | 08dc8af7339828852ae8596aeea577f9551d399d (patch) | |
| tree | 04318881b9fe92f55e91e69c35489e6cc561ac15 /app/controllers/concerns/creates_commit.rb | |
| parent | d01cbe0c8baf0ab630cf5e5d28087e91c8679b70 (diff) | |
| download | gitlab-ce-08dc8af7339828852ae8596aeea577f9551d399d.tar.gz | |
fixes distinction between renaming a file and updating its content and21092-file-execution-flag-is-not-preserved-when-editing-files
refactors update file
Diffstat (limited to 'app/controllers/concerns/creates_commit.rb')
| -rw-r--r-- | app/controllers/concerns/creates_commit.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index f2b8f297bc2..dacb5679dd3 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -7,8 +7,7 @@ module CreatesCommit commit_params = @commit_params.merge( source_project: @project, source_branch: @ref, - target_branch: @target_branch, - previous_path: @previous_path + target_branch: @target_branch ) result = service.new(@tree_edit_project, current_user, commit_params).execute |