diff options
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 7 | ||||
-rw-r--r-- | app/controllers/concerns/creates_commit.rb | 8 | ||||
-rw-r--r-- | app/models/repository.rb | 6 | ||||
-rw-r--r-- | app/services/files/update_service.rb | 3 |
5 files changed, 5 insertions, 21 deletions
@@ -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 4e976370de4..6d9c9627202 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) @@ -395,7 +397,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 75071c65efb..bf45f48e61a 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -761,14 +761,8 @@ class Repository if previous_path options[:file].merge!(previous_path: previous_path) - puts "#" * 90 - puts "Hello" - puts "#" * 90 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 7b7bce20662..6d015642b91 100644 --- a/app/services/files/update_service.rb +++ b/app/services/files/update_service.rb @@ -4,9 +4,6 @@ module Files class UpdateService < Files::BaseService def commit # Need to update file_path with the new filename - puts "#" * 10 - puts @previous_path - puts "#" * 10 repository.update_file(current_user, @file_path, @previous_path, @file_content, @commit_message, @target_branch, true) end end |