diff --git a/app/contexts/files/create_context.rb b/app/contexts/files/create_context.rb index b3d62a028c72fc6d92a4c10f375783dc9ab8fdcc..3b684d3ee92b602f894091106cb659488310251d 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 556027a3256802166406add8baca0e1fcd33aed8..2458efa4cba54e9c2fcd435bc976a035ce180100 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