Update to rails 4.2

2014-09-08 16:53:37 +02:00
parent 3fc6e61a7b
commit 2c234e8f17
7 changed files with 136 additions and 115 deletions
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'

-gem 'rails', '4.1.4'
+gem 'rails', '4.2.0.beta1'
 gem 'rack-cors', :require => 'rack/cors'

 # Bundle edge Rails instead:
@@ -19,7 +19,7 @@ group :assets do
  gem 'jquery-ui-rails'
  gem 'ember-source' #, github: 'emberjs/ember.js', require: 'ember/source'
  gem 'ember-rails'
-  gem 'sass-rails', '~> 4.0.2'
+  gem 'sass-rails', '5.0.0.beta1'
  gem 'coffee-rails' #, '~> 3.2.1'
  #gem 'twitter-bootstrap-rails'
  # Only for mobile assets precompile, not used in this project
@@ -50,7 +50,7 @@ gem 'couch_potato' , github: 'bterkuile/couch_potato'
 #gem 'simply_stored', path: './../components/simply_stored' #, github: 'bterkuile/simply_stored'
 gem 'simply_stored', github: 'bterkuile/simply_stored'
 #gem 'orm_adapter', github: 'bterkuile/orm_adapter'
-gem 'devise' #, '3.1.0' #, '2.0.4'
+gem 'devise', github: 'plataformatec/devise', branch: 'lm-rails-4-2' #, '3.1.0' #, '2.0.4'
 gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored'
 gem "omniauth-facebook"
 gem 'simple_form'