diff options
| author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-04 16:46:37 +0100 |
|---|---|---|
| committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-12 15:39:04 +0100 |
| commit | ea577ddda314fc17c87f28e35115bcba0a8df8e6 (patch) | |
| tree | 953aafa726113d6051efb38ed612a813f90c834d | |
| parent | e5caeab441d6c0e818aec369ed467c0b8b9cc29a (diff) | |
| download | gitlab-ce-ea577ddda314fc17c87f28e35115bcba0a8df8e6.tar.gz | |
refactors blob_controller
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 19 | ||||
| -rw-r--r-- | app/controllers/concerns/creates_commit.rb | 8 |
3 files changed, 31 insertions, 0 deletions
@@ -52,7 +52,11 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # 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', path: "~/src/Gitlab/gitlab_git" +>>>>>>> refactors blob_controller # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index 3eaef214875..1fc6b36379f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,12 @@ +<<<<<<< e5caeab441d6c0e818aec369ed467c0b8b9cc29a GIT remote: git@gitlab.com:gitlab-org/gitlab_git.git revision: 0e4ac299b806fa4190c4928a1c1ed5372fffbb38 branch: commit-blob-rename-action +======= +PATH + remote: ~/src/Gitlab/gitlab_git +>>>>>>> refactors blob_controller specs: gitlab_git (10.3.0) activesupport (~> 4.0) @@ -285,11 +290,16 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) +<<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30 gitlab_git (10.2.3) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) rugged (~> 0.24.0) +<<<<<<< e5caeab441d6c0e818aec369ed467c0b8b9cc29a +======= +======= +>>>>>>> refactors blob_controller gitlab_emoji (0.3.1) gemojione (~> 2.2, >= 2.2.1) >>>>>>> refactors blob_controller @@ -403,6 +413,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) @@ -875,8 +886,16 @@ DEPENDENCIES github-linguist (~> 4.7.0) github-markup (~> 1.3.1) gitlab-flowdock-git-hook (~> 1.0.1) +<<<<<<< 2da08236773692ac819a6acde0dfab8d26a26e30 gitlab_git (~> 10.2) +<<<<<<< e5caeab441d6c0e818aec369ed467c0b8b9cc29a + 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_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 036805306f2..a3731b45df0 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) |