Download as
Browse Code »

Commit 46923d1acbcccdee3852efa588b3072449fa4025

Authored by Dmitriy Zaporozhets
2 parents 4b2e151f af2e2e29
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #1285 from tsigo/gemfile_cleanup 

Gemfile cleanup
Showing 4 changed files with 4 additions and 19 deletions   Show diff stats
.rails_footnotes
View file @4b2e151
@@ -1,3 +0,0 @@ @@ -1,3 +0,0 @@
1 -#this code temporarily disables notes for all controllers  
2 -# Footnotes::Filter.notes = []  
3 -  
@@ -75,7 +75,6 @@ gem 'settingslogic' @@ -75,7 +75,6 @@ gem 'settingslogic'
75 # Misc 75 # Misc
76 gem "foreman" 76 gem "foreman"
77 gem "git" 77 gem "git"
78 -gem "gitlab_meta", '2.8'  
79 78
80 group :assets do 79 group :assets do
81 gem "sass-rails", "3.2.5" 80 gem "sass-rails", "3.2.5"
@@ -93,7 +92,6 @@ end @@ -93,7 +92,6 @@ end
93 92
94 group :development do 93 group :development do
95 gem "letter_opener" 94 gem "letter_opener"
96 - gem "rails-footnotes"  
97 gem "annotate", :git => "https://github.com/ctran/annotate_models.git" 95 gem "annotate", :git => "https://github.com/ctran/annotate_models.git"
98 gem 'rack-mini-profiler' 96 gem 'rack-mini-profiler'
99 end 97 end
@@ -113,11 +111,13 @@ end @@ -113,11 +111,13 @@ end
113 111
114 group :test do 112 group :test do
115 gem 'cucumber-rails', :require => false 113 gem 'cucumber-rails', :require => false
116 - gem 'minitest', ">= 2.10"  
117 - gem "turn", :require => false  
118 gem "simplecov", :require => false 114 gem "simplecov", :require => false
119 gem "shoulda-matchers" 115 gem "shoulda-matchers"
120 gem 'email_spec' 116 gem 'email_spec'
121 gem 'resque_spec' 117 gem 'resque_spec'
122 gem "webmock" 118 gem "webmock"
123 end 119 end
  120 +
  121 +group :production do
  122 + gem "gitlab_meta", '2.8'
  123 +end
@@ -99,7 +99,6 @@ GEM @@ -99,7 +99,6 @@ GEM
99 acts-as-taggable-on (2.3.1) 99 acts-as-taggable-on (2.3.1)
100 rails (~> 3.0) 100 rails (~> 3.0)
101 addressable (2.2.8) 101 addressable (2.2.8)
102 - ansi (1.4.2)  
103 arel (3.0.2) 102 arel (3.0.2)
104 autotest (4.4.6) 103 autotest (4.4.6)
105 ZenTest (>= 4.4.1) 104 ZenTest (>= 4.4.1)
@@ -219,7 +218,6 @@ GEM @@ -219,7 +218,6 @@ GEM
219 treetop (~> 1.4.8) 218 treetop (~> 1.4.8)
220 method_source (0.7.1) 219 method_source (0.7.1)
221 mime-types (1.19) 220 mime-types (1.19)
222 - minitest (3.1.0)  
223 modernizr (2.5.3) 221 modernizr (2.5.3)
224 sprockets (~> 2.0) 222 sprockets (~> 2.0)
225 multi_json (1.3.6) 223 multi_json (1.3.6)
@@ -259,8 +257,6 @@ GEM @@ -259,8 +257,6 @@ GEM
259 activesupport (= 3.2.8) 257 activesupport (= 3.2.8)
260 bundler (~> 1.0) 258 bundler (~> 1.0)
261 railties (= 3.2.8) 259 railties (= 3.2.8)
262 - rails-footnotes (3.7.8)  
263 - rails (>= 3.0.0)  
264 railties (3.2.8) 260 railties (3.2.8)
265 actionpack (= 3.2.8) 261 actionpack (= 3.2.8)
266 activesupport (= 3.2.8) 262 activesupport (= 3.2.8)
@@ -350,8 +346,6 @@ GEM @@ -350,8 +346,6 @@ GEM
350 treetop (1.4.10) 346 treetop (1.4.10)
351 polyglot 347 polyglot
352 polyglot (>= 0.3.1) 348 polyglot (>= 0.3.1)
353 - turn (0.9.5)  
354 - ansi  
355 tzinfo (0.3.33) 349 tzinfo (0.3.33)
356 uglifier (1.0.3) 350 uglifier (1.0.3)
357 execjs (>= 0.3.0) 351 execjs (>= 0.3.0)
@@ -409,7 +403,6 @@ DEPENDENCIES @@ -409,7 +403,6 @@ DEPENDENCIES
409 launchy 403 launchy
410 letter_opener 404 letter_opener
411 linguist (~> 1.0.0)! 405 linguist (~> 1.0.0)!
412 - minitest (>= 2.10)  
413 modernizr (= 2.5.3) 406 modernizr (= 2.5.3)
414 mysql2 407 mysql2
415 omniauth-ldap! 408 omniauth-ldap!
@@ -417,7 +410,6 @@ DEPENDENCIES @@ -417,7 +410,6 @@ DEPENDENCIES
417 pygments.rb! 410 pygments.rb!
418 rack-mini-profiler 411 rack-mini-profiler
419 rails (= 3.2.8) 412 rails (= 3.2.8)
420 - rails-footnotes  
421 raphael-rails (= 1.5.2) 413 raphael-rails (= 1.5.2)
422 redcarpet (~> 2.1.1) 414 redcarpet (~> 2.1.1)
423 resque (~> 1.20.0) 415 resque (~> 1.20.0)
@@ -434,7 +426,6 @@ DEPENDENCIES @@ -434,7 +426,6 @@ DEPENDENCIES
434 stamp 426 stamp
435 therubyracer 427 therubyracer
436 thin 428 thin
437 - turn  
438 uglifier (= 1.0.3) 429 uglifier (= 1.0.3)
439 unicorn 430 unicorn
440 webmock 431 webmock
config/initializers/rails_footnotes.rb
View file @4b2e151
@@ -1,3 +0,0 @@ @@ -1,3 +0,0 @@
1 -#if defined?(Footnotes) && Rails.env.development?  
2 - #Footnotes.run! # first of all  
3 -#end