Download as
Browse Code »

Commit 64a617d5a263078ec597fc2e7c7534af39ad7b02

Authored by Antonio Terceiro
1 parent f9d14ef0
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Making `rake gems:install` actually work 

This will install the needed gems in the working versions.
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
config/environment.rb
  Diff comments   View file @64a617d
... ... @@ -56,7 +56,7 @@ Rails::Initializer.run do |config|
56 56 # config.active_record.observers = :cacher, :garbage_collector
57 57  
58 58 # don't load the sweepers while loading the database
59   - unless $PROGRAM_NAME =~ /rake$/ && ARGV.first == 'db:schema:load'
  59 + unless $PROGRAM_NAME =~ /rake$/ && (ARGV.first == 'db:schema:load' || ARGV.first == 'gems:install')
60 60 config.active_record.observers = :article_sweeper, :role_assignment_sweeper, :friendship_sweeper, :category_sweeper
61 61 end
62 62 # Make Active Record use UTC-base instead of local time
... ...
config/environments/cucumber.rb
  Diff comments   View file @64a617d
... ... @@ -19,8 +19,8 @@ config.action_controller.allow_forgery_protection = false
19 19 # ActionMailer::Base.deliveries array.
20 20 config.action_mailer.delivery_method = :test
21 21  
22   -config.gem 'cucumber', :lib => false, :version => '>=0.4.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
23   -config.gem 'webrat', :lib => false, :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
  22 +config.gem 'cucumber', :lib => false, :version => '0.4.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
  23 +config.gem 'webrat', :lib => false, :version => '0.5.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
24 24 config.gem 'rspec', :lib => 'spec', :version => '>=1.2.8' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec'))
25 25 config.gem 'rspec-rails', :lib => 'spec/rails', :version => '>=1.2.7.1' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
26 26 config.gem 'Selenium', :lib => 'selenium', :version => '>= 1.1.14' unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium'))
... ...