Merge pull request #7 from mattr-/master

Cleanup the environment files after converting to Bundler
This commit is contained in:
Reinier Balt 2011-09-02 13:46:57 -07:00
commit 8a437595a8
4 changed files with 0 additions and 30 deletions

View file

@ -21,16 +21,6 @@ Rails::Initializer.run do |config|
# config.frameworks -= [ :action_web_service, :action_mailer ]
config.autoload_paths += %W( #{RAILS_ROOT}/app/apis )
config.gem "highline"
config.gem "RedCloth", :lib => 'redcloth', :version => '4.2.3'
config.gem "soap4r", :lib => false
config.gem 'actionwebservice'
config.gem 'sanitize', :version => '~> 1.2.1'
config.gem 'rack', :version => '1.1.0'
config.gem 'will_paginate', :version => '~> 2.3.15'
config.gem 'has_many_polymorphs'
config.gem 'aasm', :version => '2.2.0'
config.action_controller.use_accept_header = true
# Use the database for sessions instead of the file system
@ -71,11 +61,6 @@ Rails::Initializer.run do |config|
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de
# See Rails::Configuration for more options
if ( SITE_CONFIG['authentication_schemes'].include? 'cas')
#requires rubycas-client gem to be installed
config.gem "rubycas-client", :lib => 'casclient'
end
end
# Add new inflection rules using the following format

View file

@ -26,8 +26,3 @@ config.action_mailer.delivery_method = :test
config.action_controller.session_store = :cookie_store
config.action_controller.session = { :key => 'TracksCucumber', :secret => SITE_CONFIG['salt'] * (30.0 / SITE_CONFIG['salt'].length).ceil }
config.gem 'cucumber', :lib => false, :version => '=0.9.4' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber'))
config.gem 'cucumber-rails', :lib => false, :version => '=0.3.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails'))
config.gem 'gherkin', :lib => false, :version => '=2.4.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/gherkin'))
config.gem 'database_cleaner', :lib => false, :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
config.gem 'webrat', :lib => false, :version => '>=0.7.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))

View file

@ -24,6 +24,3 @@ config.action_mailer.delivery_method = :test
# Unique cookies
config.action_controller.session = { :key => 'TracksSelenium' }
config.gem 'database_cleaner', :lib => false, :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
config.gem 'selenium-client', :lib => false unless File.directory?(File.join(Rails.root, 'vendor/plugins/selenium-client'))
config.gem 'mongrel' # required by webrat for selenium

View file

@ -36,10 +36,3 @@ config.after_initialize do
require File.expand_path(File.dirname(__FILE__) + "/../../test/selenium_helper")
end
config.gem "flexmock"
config.gem "ZenTest", :lib => "zentest", :version => ">=4.0.0"
config.gem "hpricot"
config.gem "hoe"
config.gem 'webrat', :lib => false, :version => '>=0.7.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/webrat'))
config.gem 'rspec-rails', :lib => false, :version => '~>1.3.3' unless File.directory?(File.join(Rails.root, 'vendor/plugins/rspec-rails'))
config.gem "thoughtbot-factory_girl", :lib => "factory_girl", :source => "http://gems.github.com"