diff options
Diffstat (limited to 'app/services/files/update_service.rb')
-rw-r--r-- | app/services/files/update_service.rb | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb index 5efd43d16ce..4d7ac3b7504 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -19,23 +19,20 @@ module Files return error("You can only edit text files") end - if params[:encoding] == 'base64' - edit_file_action = Gitlab::Satellite::EditFileAction.new(current_user, project, ref, path) - edit_file_action.commit!( - params[:content], - params[:commit_message], - params[:encoding], - params[:new_branch] - ) - else - repository.commit_file( - current_user, - path, - params[:content], - params[:commit_message], - params[:new_branch] || ref - ) - end + content = + if params[:encoding] == 'base64' + Base64.decode64(params[:content]) + else + params[:content] + end + + repository.commit_file( + current_user, + path, + content, + params[:commit_message], + params[:new_branch] || ref + ) success rescue Gitlab::Satellite::CheckoutFailed => ex |