removes debugging prints from code

4 files changed, 5 insertions, 28 deletions

diff --git a/Gemfile b/Gemfile
index 9eaffc4a94b..37c5c021beb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ gem "browser", '~> 2.2'
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git"
+gem "gitlab_git", '~> 10.2', git: "git@gitlab.com:gitlab-org/gitlab_git.git", branch: "commit-blob-rename-action"
 
 # LDAP Auth
 # GitLab fork with several improvements to original library. For full list of changes
diff --git a/Gemfile.lock b/Gemfile.lock
index 96bb7b2e3d5..51258219628 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,5 +1,7 @@
-PATH
-  remote: ~/src/Gitlab/gitlab_git
+GIT
+  remote: git@gitlab.com:gitlab-org/gitlab_git.git
+  revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38
+  branch: commit-blob-rename-action
   specs:
     gitlab_git (10.3.0)
       activesupport (~> 4.0)
@@ -403,7 +405,6 @@ GEM
     mail_room (0.8.0)
     method_source (0.8.2)
     mime-types (2.99.2)
-    mime-types-data (3.2016.0521)
     mimemagic (0.3.0)
     mini_portile2 (2.1.0)
     minitest (5.7.0)
diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb
index a3731b45df0..036805306f2 100644
--- a/app/controllers/concerns/creates_commit.rb
+++ b/app/controllers/concerns/creates_commit.rb
@@ -12,16 +12,8 @@ module CreatesCommit
       previous_path: @previous_path
     )
 
-    puts "#" * 10
-    puts @previous_path
-    puts "#" * 10
-
     result = service.new(@tree_edit_project, current_user, commit_params).execute
 
-    puts "#" * 30
-    puts result[:status]
-    puts "#" * 30
-
     if result[:status] == :success
       update_flash_notice(success_notice)
 
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 0e4b85bd5ff..16988f6df3d 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -749,31 +749,15 @@ class Repository
       options[:author] = committer
       options[:commit] = {
         message: message,
-<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945
-        branch: ref
-      }
-
-=======
         branch: ref,
       }
 
-      if previous_path
-        options[:file] = {
-          path: previous_path
-        }
-
-
-        Gitlab::Git::Blob.remove(raw_repository, options)
-      end
-
->>>>>>> creates the update_file method in repository.rb and applies changes accordingly
       options[:file] = {
         content: content,
         path: path,
         update: update
       }
 
-<<<<<<< 3824e8e1c4315bb3d1b2c1389f442d3b5e94f945
       if previous_path
         options[:file].merge!(previous_path: previous_path)