From a50322679c8aec2858992aeac558f857c98ae28e Mon Sep 17 00:00:00 2001
From: tiagonbotelho <tiagonbotelho@hotmail.com>
Date: Mon, 4 Jul 2016 16:46:37 +0100
Subject: [PATCH] refactors blob_controller
---
Gemfile | 2 +-
Gemfile.lock | 20 ++++++++++++++++----
app/controllers/concerns/creates_commit.rb | 8 ++++++++
3 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/Gemfile b/Gemfile
index cbcd9f20ace..1fc1be9e272 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'
+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 8809edb0fc9..57f2b056c86 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,12 @@
+PATH
+ remote: ~/src/Gitlab/gitlab_git
+ specs:
+ gitlab_git (10.3.0)
+ activesupport (~> 4.0)
+ charlock_holmes (~> 0.7.3)
+ github-linguist (~> 4.7.0)
+ rugged (~> 0.24.0)
+
GEM
remote: https://rubygems.org/
specs:
@@ -277,10 +286,8 @@ GEM
mime-types (>= 1.16, < 3)
posix-spawn (~> 0.3)
gitlab_git (10.3.0)
- activesupport (~> 4.0)
- charlock_holmes (~> 0.7.3)
- github-linguist (~> 4.7.0)
- rugged (~> 0.24.0)
+ gitlab_emoji (0.3.1)
+ gemojione (~> 2.2, >= 2.2.1)
gitlab_meta (7.0)
gitlab_omniauth-ldap (1.2.1)
net-ldap (~> 0.9)
@@ -392,7 +399,12 @@ GEM
mail_room (0.8.0)
method_source (0.8.2)
mime-types (2.99.2)
+<<<<<<< 66468bd73385b31b3a4380c85264dfbe06542d79
mimemagic (0.3.1)
+=======
+ mime-types-data (3.2016.0521)
+ mimemagic (0.3.0)
+>>>>>>> refactors blob_controller
mini_portile2 (2.1.0)
minitest (5.7.0)
mousetrap-rails (1.4.6)
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)
--
GitLab