Update process phase1

This commit is contained in:
2013-12-17 09:41:35 +01:00
parent b1937f1e38
commit 748944865d
8 changed files with 194 additions and 168 deletions
+9 -7
View File
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
gem 'rails', '3.2.13'
gem 'rails', '4.0.2'
gem 'rack-cors', :require => 'rack/cors'
# Bundle edge Rails instead:
@@ -17,10 +17,10 @@ gem 'slim-rails'
# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
gem 'sass-rails' #, '~> 3.2.3'
gem 'coffee-rails' #, '~> 3.2.1'
#gem 'twitter-bootstrap-rails'
gem 'bootstrap-sass'
gem 'bootstrap-sass', '~>2.3.2.2'
gem 'bourbon'
gem 'compass-rails'
gem 'js-routes'
@@ -38,7 +38,7 @@ end
gem 'couch_potato' , github: 'bterkuile/couch_potato'
gem 'simply_stored' , github: 'bterkuile/simply_stored'
gem 'orm_adapter', github: 'bterkuile/orm_adapter'
gem 'devise', '3.1.0' #, '2.0.4'
gem 'devise' #, '3.1.0' #, '2.0.4'
gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored'
gem "omniauth-facebook"
gem 'simple_form'
@@ -70,11 +70,13 @@ group :test do
#gem 'steak'
gem 'rspec-rails'
gem 'database_cleaner'
gem 'capybara-webkit'
gem 'capybara' #, '2.0.3'
gem 'selenium-webdriver'
#gem 'capybara-webkit', '~>0.14.2' # version 1.1.0 does not yet compile in mavericks
gem 'turnip'
gem 'launchy'
gem 'fuubar'
gem 'rb-fsevent', :require => false #if RUBY_PLATFORM =~ /darwin/i
#gem 'rb-fsevent', :require => false #if RUBY_PLATFORM =~ /darwin/i
gem 'factory_girl_rails'
gem 'pry-rails'
end