Upgrades and simple_form dependency removal

This commit is contained in:
2014-12-11 14:37:09 +01:00
parent 1a3f528731
commit 711f878a3a
16 changed files with 8134 additions and 8348 deletions
+6 -5
View File
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
gem 'rails', '4.2.0.beta4'
gem 'rails', '4.2.0.rc2'
gem 'rack-cors', :require => 'rack/cors'
# Bundle edge Rails instead:
@@ -17,7 +17,7 @@ gem 'active_model_serializers' # explicitly outside assets
group :assets do
gem 'jquery-rails'
gem 'jquery-ui-rails'
gem 'ember-source' #, github: 'emberjs/ember.js', require: 'ember/source'
gem 'ember-source', '1.8.1'#, github: 'emberjs/ember.js', require: 'ember/source'
gem 'ember-rails'
gem 'ember_script-rails', github: 'ghempton/ember-script-rails'
gem 'sass-rails', '5.0.0.beta1'
@@ -54,7 +54,7 @@ gem 'simply_stored', github: 'bterkuile/simply_stored'
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'
#gem 'simple_form'
gem 'active_decorator' #, path: '/Users/bterkuile/companytools/development/rails/components/active_decorator'
#gem 'cmtool', github: 'bterkuile/cmtool'
gem 'paperclip' #, '3.5.2' # cmtool
@@ -93,7 +93,7 @@ group :development do
gem 'capistrano-rails', '~> 1.1', require: false
gem 'spring'
gem 'spring-commands-rspec'
gem 'web-console', '~> 2.0.0.beta3'
gem 'web-console', '~> 2.0.0'
end
@@ -103,6 +103,7 @@ group :test do
# 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 'capybara-screenshot'
gem 'turnip'
gem 'rspec-its'
gem 'launchy'
@@ -114,7 +115,7 @@ end
# Use unicorn as the app server
# gem 'unicorn'
gem 'foreman'
# gem 'foreman'
# Deploy with Capistrano
# gem 'capistrano'