Commit ea577ddd authored by tiagonbotelho's avatar tiagonbotelho

refactors blob_controller

parent e5caeab4
...@@ -52,7 +52,11 @@ gem 'browser', '~> 2.2' ...@@ -52,7 +52,11 @@ gem 'browser', '~> 2.2'
# Extracting information from a git repository # Extracting information from a git repository
# Provide access to Gitlab::Git library # Provide access to Gitlab::Git library
<<<<<<< e5caeab441d6c0e818aec369ed467c0b8b9cc29a
gem "gitlab_git", '~> 10.2', git: "git@gitlab.com:gitlab-org/gitlab_git.git", branch: "commit-blob-rename-action" 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"
>>>>>>> refactors blob_controller
# LDAP Auth # LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes # GitLab fork with several improvements to original library. For full list of changes
......
<<<<<<< e5caeab441d6c0e818aec369ed467c0b8b9cc29a
GIT GIT
remote: git@gitlab.com:gitlab-org/gitlab_git.git remote: git@gitlab.com:gitlab-org/gitlab_git.git
revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38
branch: commit-blob-rename-action branch: commit-blob-rename-action
=======
PATH
remote: ~/src/Gitlab/gitlab_git
>>>>>>> refactors blob_controller
specs: specs:
gitlab_git (10.3.0) gitlab_git (10.3.0)
activesupport (~> 4.0) activesupport (~> 4.0)
...@@ -285,11 +290,16 @@ GEM ...@@ -285,11 +290,16 @@ GEM
diff-lcs (~> 1.1) diff-lcs (~> 1.1)
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 3)
posix-spawn (~> 0.3) posix-spawn (~> 0.3)
<<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30
gitlab_git (10.2.3) gitlab_git (10.2.3)
activesupport (~> 4.0) activesupport (~> 4.0)
charlock_holmes (~> 0.7.3) charlock_holmes (~> 0.7.3)
github-linguist (~> 4.7.0) github-linguist (~> 4.7.0)
rugged (~> 0.24.0) rugged (~> 0.24.0)
<<<<<<< e5caeab441d6c0e818aec369ed467c0b8b9cc29a
=======
=======
>>>>>>> refactors blob_controller
gitlab_emoji (0.3.1) gitlab_emoji (0.3.1)
gemojione (~> 2.2, >= 2.2.1) gemojione (~> 2.2, >= 2.2.1)
>>>>>>> refactors blob_controller >>>>>>> refactors blob_controller
...@@ -403,6 +413,7 @@ GEM ...@@ -403,6 +413,7 @@ GEM
mail_room (0.8.0) mail_room (0.8.0)
method_source (0.8.2) method_source (0.8.2)
mime-types (2.99.2) mime-types (2.99.2)
mime-types-data (3.2016.0521)
mimemagic (0.3.0) mimemagic (0.3.0)
mini_portile2 (2.1.0) mini_portile2 (2.1.0)
minitest (5.7.0) minitest (5.7.0)
...@@ -875,8 +886,16 @@ DEPENDENCIES ...@@ -875,8 +886,16 @@ DEPENDENCIES
github-linguist (~> 4.7.0) github-linguist (~> 4.7.0)
github-markup (~> 1.3.1) github-markup (~> 1.3.1)
gitlab-flowdock-git-hook (~> 1.0.1) gitlab-flowdock-git-hook (~> 1.0.1)
<<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30
gitlab_git (~> 10.2) gitlab_git (~> 10.2)
<<<<<<< e5caeab441d6c0e818aec369ed467c0b8b9cc29a
gitlab_emoji (~> 0.3.0)
=======
=======
gitlab_emoji (~> 0.3.0) gitlab_emoji (~> 0.3.0)
gitlab_git (~> 10.2)!
>>>>>>> refactors blob_controller
>>>>>>> refactors blob_controller
gitlab_meta (= 7.0) gitlab_meta (= 7.0)
gitlab_omniauth-ldap (~> 1.2.1) gitlab_omniauth-ldap (~> 1.2.1)
gollum-lib (~> 4.1.0) gollum-lib (~> 4.1.0)
......
...@@ -12,8 +12,16 @@ module CreatesCommit ...@@ -12,8 +12,16 @@ module CreatesCommit
previous_path: @previous_path previous_path: @previous_path
) )
puts "#" * 10
puts @previous_path
puts "#" * 10
result = service.new(@tree_edit_project, current_user, commit_params).execute result = service.new(@tree_edit_project, current_user, commit_params).execute
puts "#" * 30
puts result[:status]
puts "#" * 30
if result[:status] == :success if result[:status] == :success
update_flash_notice(success_notice) update_flash_notice(success_notice)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment