Create and edit files in web editor via rugged

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

2 files changed, 34 insertions, 14 deletions

diff --git a/app/services/files/create_service.rb b/app/services/files/create_service.rb
index 23833aa78ec..c0cf5956326 100644
--- a/app/services/files/create_service.rb
+++ b/app/services/files/create_service.rb
@@ -33,14 +33,24 @@ module Files
         end
       end
 
+      if params[:encoding] == 'base64'
+        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[:encoding],
+          params[:new_branch]
+        )
+      else
+        created_successfull = repository.commit_file(
+          current_user,
+          file_path,
+          params[:content],
+          params[:commit_message],
+          params[:new_branch] || ref
+        )
+      end
 
-      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[:encoding],
-        params[:new_branch]
-      )
 
       if created_successfully
         success
diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb
index 0724d3ae634..5efd43d16ce 100644
--- a/app/services/files/update_service.rb
+++ b/app/services/files/update_service.rb
@@ -19,13 +19,23 @@ module Files
         return error("You can only edit text files")
       end
 
-      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]
-      )
+      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
 
       success
     rescue Gitlab::Satellite::CheckoutFailed => ex