diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-16 18:10:35 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-16 18:10:35 +0200 |
| commit | 7001ad2dda56343dcdf035aebdf3334068d123a0 (patch) | |
| tree | 93de4c22c636cf9cd4c192bcf3fbe79d7c5448ab | |
| parent | 1d497a127b2a54953e783375d1f9e6fd728abdb8 (diff) | |
| download | gitlab-ce-7001ad2dda56343dcdf035aebdf3334068d123a0.tar.gz | |
Add files encoding support on context level
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/contexts/files/create_context.rb | 3 | ||||
| -rw-r--r-- | app/contexts/files/update_context.rb | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/contexts/files/create_context.rb b/app/contexts/files/create_context.rb index b3d62a028c7..3b684d3ee92 100644 --- a/app/contexts/files/create_context.rb +++ b/app/contexts/files/create_context.rb @@ -33,7 +33,8 @@ module Files new_file_action = Gitlab::Satellite::NewFileAction.new(current_user, project, ref, file_path) created_successfully = new_file_action.commit!( params[:content], - params[:commit_message] + params[:commit_message], + params[:encoding] ) if created_successfully diff --git a/app/contexts/files/update_context.rb b/app/contexts/files/update_context.rb index 556027a3256..2458efa4cba 100644 --- a/app/contexts/files/update_context.rb +++ b/app/contexts/files/update_context.rb @@ -23,10 +23,11 @@ module Files return error("You can only edit text files") end - new_file_action = Gitlab::Satellite::EditFileAction.new(current_user, project, ref, path) - created_successfully = new_file_action.commit!( + edit_file_action = Gitlab::Satellite::EditFileAction.new(current_user, project, ref, path) + created_successfully = edit_file_action.commit!( params[:content], - params[:commit_message] + params[:commit_message], + params[:encooding] ) if created_successfully |