From 815e678c4e331df49ee080af149253be008faf76 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 11 Aug 2015 11:50:48 +0200
Subject: [PATCH] Revert "Use rugged in web editor for base64 encoding"

This reverts commit 541133197be098732cdc14a12aa059e21cac3d71.
---
 app/services/files/create_service.rb | 31 +++++++++++++++-------------
 app/services/files/update_service.rb | 31 +++++++++++++++-------------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/app/services/files/create_service.rb b/app/services/files/create_service.rb
index 3516cf30dbc..21065f71510 100644
--- a/app/services/files/create_service.rb
+++ b/app/services/files/create_service.rb
@@ -33,20 +33,23 @@ module Files
         end
       end
 
-      content =
-        if params[:encoding] == 'base64'
-          Base64.decode64(params[:content])
-        else
-          params[:content]
-        end
-
-      created_successfully = repository.commit_file(
-        current_user,
-        file_path,
-        content,
-        params[:commit_message],
-        params[:new_branch] || ref
-      )
+      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_successfully = repository.commit_file(
+          current_user,
+          file_path,
+          params[:content],
+          params[:commit_message],
+          params[:new_branch] || ref
+        )
+      end
 
 
       if created_successfully
diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb
index 4d7ac3b7504..5efd43d16ce 100644
--- a/app/services/files/update_service.rb
+++ b/app/services/files/update_service.rb
@@ -19,20 +19,23 @@ module Files
         return error("You can only edit text files")
       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
-      )
+      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
-- 
GitLab