bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Getting ready for preview deployment

Browse Source
This commit is contained in:
Godwin 2015-05-02 11:11:17 -07:00
parent 14205f4586
commit 94fddcf54e
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Gemfile
View File

@ -1,6 +1,5 @@
source 'http://rubygems.org' source 'http://rubygems.org'
#ruby '2.0.0'
gem 'rails', '4.2.0' gem 'rails', '4.2.0'
gem 'pg' gem 'pg'
gem 'haml' gem 'haml'
@ -9,12 +8,6 @@ gem 'jquery-ui-rails'
gem 'coffee-rails', '~> 4.0.0' gem 'coffee-rails', '~> 4.0.0'
gem 'lingua_franca', :git => 'git://github.com/lingua-franca/lingua_franca.git' gem 'lingua_franca', :git => 'git://github.com/lingua-franca/lingua_franca.git'
gem 'tzinfo-data' gem 'tzinfo-data'
#gem 'i18n-active_record',
# :git => 'git://github.com/svenfuchs/i18n-active_record.git',
# :require => 'i18n/active_record'
#gem 'sass', '~> 3.3'
#gem 'compass'
#gem 'compass-rails'
gem 'sass', '~> 3.4.13' gem 'sass', '~> 3.4.13'
gem 'sass-rails', :git => 'git://github.com/rails/sass-rails.git' gem 'sass-rails', :git => 'git://github.com/rails/sass-rails.git'
gem 'bumbleberry', :git => 'git://github.com/bumbleberry/bumbleberry.git' gem 'bumbleberry', :git => 'git://github.com/bumbleberry/bumbleberry.git'
@ -25,12 +18,9 @@ gem 'oauth2', '~> 0.8.0'
gem 'carrierwave' gem 'carrierwave'
gem 'carrierwave-imageoptimizer' gem 'carrierwave-imageoptimizer'
gem 'mini_magick' gem 'mini_magick'
#gem 'carmen', :git => 'git://github.com/eikes/carmen.git'
#gem 'carmen-rails'
gem 'nested_form' gem 'nested_form'
gem 'acts_as_list' gem 'acts_as_list'
gem 'geocoder' gem 'geocoder'
#gem 'forgery'
gem 'paper_trail', '~> 3.0.5' gem 'paper_trail', '~> 3.0.5'
gem 'font-awesome-rails' gem 'font-awesome-rails'
gem 'wysiwyg-rails' gem 'wysiwyg-rails'
@ -40,8 +30,7 @@ gem 'activerecord-session_store'
gem 'paypal-express', '0.7.1' gem 'paypal-express', '0.7.1'
gem 'sass-json-vars' gem 'sass-json-vars'
group :assets do gem 'copydb'
end
group :development, :test do group :development, :test do
gem 'rspec' gem 'rspec'
@ -54,7 +43,6 @@ group :development do
gem 'meta_request' gem 'meta_request'
gem 'haml-rails' gem 'haml-rails'
gem 'awesome_print' gem 'awesome_print'
#gem 'rails-footnotes', :github => 'josevalim/rails-footnotes'
end end
group :test do group :test do

2
config/application.rb
View File

@ -26,7 +26,7 @@ module BikeBike
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
config.i18n.default_locale = :en config.i18n.default_locale = :en
config.i18n.enforce_available_locales = false config.i18n.enforce_available_locales = false
self.paths['config/database'] = Rails.root.parent.join('BikeBike', 'config', 'database.yml') self.paths['config/database'] = Rails.root.join('config', 'database.yml')
config.active_record.raise_in_transactional_callbacks = true config.active_record.raise_in_transactional_callbacks = true
end end
end end