diff --git a/Gemfile b/Gemfile index 9e9ecbfdf04c45b80713e56719f1318111abf0e4..6c27999cd189027755be1815b0c21f924c020810 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', git: "git@gitlab.com:gitlab-org/gitlab_git.git", branch: "commit-blob-rename-action" +gem "gitlab_git", '~> 10.2', path: "~/src/Gitlab/gitlab_git" # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index 9a7563bcbef733bd4c3d3ca328912565d5313942..746171a323aa4c27d61a6db6a3022c43823db5be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,5 @@ -GIT - remote: git@gitlab.com:gitlab-org/gitlab_git.git - revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 - branch: commit-blob-rename-action +PATH + remote: ~/src/Gitlab/gitlab_git specs: gitlab_git (10.3.0) activesupport (~> 4.0) @@ -285,7 +283,11 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) +<<<<<<< c8a4e2263956a80cb91c12cbbd1e008dcac6ee02 <<<<<<< 9a9ecc313f7963f134247e0815b285b5733e07c7 +======= +<<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30 +>>>>>>> refactors blob_controller gitlab_git (10.2.3) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) @@ -405,6 +407,7 @@ 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) @@ -878,6 +881,7 @@ DEPENDENCIES github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) gitlab_git (~> 10.2) + gitlab_emoji (~> 0.3.0) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.1.0) diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb index 036805306f25b444e7db4ecf1daf67ad1e890fa6..a3731b45df0afaf06194239b05b5838e02c8c676 100644 --- a/app/controllers/concerns/creates_commit.rb +++ b/app/controllers/concerns/creates_commit.rb @@ -12,8 +12,16 @@ 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)