From 2c128f3874eabf642ba78775e169177129f10a97 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Thu, 23 Aug 2012 19:20:28 -0400 Subject: [PATCH 1/3] Remove rails-footnotes gem and its related files --- .rails_footnotes | 3 --- Gemfile | 1 - Gemfile.lock | 3 --- config/initializers/rails_footnotes.rb | 3 --- 4 files changed, 10 deletions(-) delete mode 100644 .rails_footnotes delete mode 100644 config/initializers/rails_footnotes.rb diff --git a/.rails_footnotes b/.rails_footnotes deleted file mode 100644 index 1019a70aa1b..00000000000 --- a/.rails_footnotes +++ /dev/null @@ -1,3 +0,0 @@ -#this code temporarily disables notes for all controllers -# Footnotes::Filter.notes = [] - diff --git a/Gemfile b/Gemfile index f256eccb905..214c06a99bf 100644 --- a/Gemfile +++ b/Gemfile @@ -93,7 +93,6 @@ end group :development do gem "letter_opener" - gem "rails-footnotes" gem "annotate", :git => "https://github.com/ctran/annotate_models.git" gem 'rack-mini-profiler' end diff --git a/Gemfile.lock b/Gemfile.lock index b2a00118e5d..c2d60d798e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -259,8 +259,6 @@ GEM activesupport (= 3.2.8) bundler (~> 1.0) railties (= 3.2.8) - rails-footnotes (3.7.8) - rails (>= 3.0.0) railties (3.2.8) actionpack (= 3.2.8) activesupport (= 3.2.8) @@ -417,7 +415,6 @@ DEPENDENCIES pygments.rb! rack-mini-profiler rails (= 3.2.8) - rails-footnotes raphael-rails (= 1.5.2) redcarpet (~> 2.1.1) resque (~> 1.20.0) diff --git a/config/initializers/rails_footnotes.rb b/config/initializers/rails_footnotes.rb deleted file mode 100644 index afe6f3ad383..00000000000 --- a/config/initializers/rails_footnotes.rb +++ /dev/null @@ -1,3 +0,0 @@ -#if defined?(Footnotes) && Rails.env.development? - #Footnotes.run! # first of all -#end -- GitLab From 4adac4deba315c182820a1fe820fe0d297ae21ab Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Thu, 23 Aug 2012 19:21:20 -0400 Subject: [PATCH 2/3] Move gitlab_meta gem to :production group --- Gemfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 214c06a99bf..73daebec787 100644 --- a/Gemfile +++ b/Gemfile @@ -75,7 +75,6 @@ gem 'settingslogic' # Misc gem "foreman" gem "git" -gem "gitlab_meta", '2.8' group :assets do gem "sass-rails", "3.2.5" @@ -120,3 +119,7 @@ group :test do gem 'resque_spec' gem "webmock" end + +group :production do + gem "gitlab_meta", '2.8' +end -- GitLab From af2e2e29b9b537f6bae752b74280ca7a3819d468 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Thu, 23 Aug 2012 19:21:55 -0400 Subject: [PATCH 3/3] Remove unused minitest and turn gems --- Gemfile | 2 -- Gemfile.lock | 6 ------ 2 files changed, 8 deletions(-) diff --git a/Gemfile b/Gemfile index 73daebec787..4629383e986 100644 --- a/Gemfile +++ b/Gemfile @@ -111,8 +111,6 @@ end group :test do gem 'cucumber-rails', :require => false - gem 'minitest', ">= 2.10" - gem "turn", :require => false gem "simplecov", :require => false gem "shoulda-matchers" gem 'email_spec' diff --git a/Gemfile.lock b/Gemfile.lock index c2d60d798e3..88da1cd9481 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,7 +99,6 @@ GEM acts-as-taggable-on (2.3.1) rails (~> 3.0) addressable (2.2.8) - ansi (1.4.2) arel (3.0.2) autotest (4.4.6) ZenTest (>= 4.4.1) @@ -219,7 +218,6 @@ GEM treetop (~> 1.4.8) method_source (0.7.1) mime-types (1.19) - minitest (3.1.0) modernizr (2.5.3) sprockets (~> 2.0) multi_json (1.3.6) @@ -348,8 +346,6 @@ GEM treetop (1.4.10) polyglot polyglot (>= 0.3.1) - turn (0.9.5) - ansi tzinfo (0.3.33) uglifier (1.0.3) execjs (>= 0.3.0) @@ -407,7 +403,6 @@ DEPENDENCIES launchy letter_opener linguist (~> 1.0.0)! - minitest (>= 2.10) modernizr (= 2.5.3) mysql2 omniauth-ldap! @@ -431,7 +426,6 @@ DEPENDENCIES stamp therubyracer thin - turn uglifier (= 1.0.3) unicorn webmock -- GitLab