summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortiagonbotelho <tiagonbotelho@hotmail.com>2016-07-05 09:46:48 +0100
committertiagonbotelho <tiagonbotelho@hotmail.com>2016-07-12 15:34:44 +0100
commit71bab5fe58e6b408c67ea681cba371459ae40e7b (patch)
treedafda2eed2662a9a5f1ff01aa6fd99c7e7eeac79
parente621fb57c4c40bc05cfc2c88a1a7b2493cafc2f4 (diff)
downloadgitlab-ce-71bab5fe58e6b408c67ea681cba371459ae40e7b.tar.gz
removes debugging prints from code
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock7
-rw-r--r--app/controllers/concerns/creates_commit.rb8
-rw-r--r--app/models/repository.rb3
-rw-r--r--app/services/files/update_service.rb1
5 files changed, 6 insertions, 15 deletions
diff --git a/Gemfile b/Gemfile
index 1fc1be9e272..cce820fb53a 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 d65616ad766..3eaef214875 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)
@@ -401,7 +403,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 e8a18746216..a391820a8ba 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -753,9 +753,6 @@ class Repository
Gitlab::Git::Blob.rename(raw_repository, options)
else
- puts "#" * 90
- puts "World"
- puts "#" * 90
Gitlab::Git::Blob.commit(raw_repository, options)
end
end
diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb
index fefa1d4ef68..41add13af50 100644
--- a/app/services/files/update_service.rb
+++ b/app/services/files/update_service.rb
@@ -3,6 +3,7 @@ require_relative "base_service"
module Files
class UpdateService < Files::BaseService
def commit
+
repository.update_file(current_user, @file_path, @previous_path, @file_content, @commit_message, @target_branch, true)
end
end