From 7001ad2dda56343dcdf035aebdf3334068d123a0 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 16 Jan 2014 18:10:35 +0200
Subject: [PATCH] Add files encoding support on context level
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
app/contexts/files/create_context.rb | 3 ++-
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
--
GitLab