Big upgrade and supplier style upgrades

This commit is contained in:
2015-02-13 15:58:11 +01:00
parent de3f2f7cae
commit 78f1056dc7
19 changed files with 238 additions and 242 deletions
+4 -5
View File
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
gem 'rails', '4.2.0.rc2'
gem 'rails', '4.2.0'
gem 'rack-cors', :require => 'rack/cors'
# Bundle edge Rails instead:
@@ -20,12 +20,12 @@ group :assets do
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'
gem 'sass-rails', '~> 5.0.0'
gem 'coffee-rails' #, '~> 3.2.1'
#gem 'twitter-bootstrap-rails'
# Only for mobile assets precompile, not used in this project
gem 'bootstrap-sass', '~>2.3'
gem 'bourbon', '4.0.2'
#gem 'bootstrap-sass', '~>2.3'
gem 'bourbon' #, '4.0.2'
#gem 'compass-rails'
gem 'js-routes'
gem "font-awesome-rails"
@@ -96,7 +96,6 @@ group :development do
gem 'spring'
gem 'spring-commands-rspec'
gem 'web-console', '~> 2.0.0'
end
group :test do