Upgraded ruby to 2.2.4 and gems: sprockets-rails and bundler

This commit is contained in:
Al Snow
2015-12-18 10:51:26 -05:00
parent 38240cd963
commit edf9a6d560
5 changed files with 9 additions and 8 deletions
+1 -1
View File
@@ -1 +1 @@
2.2.3 2.2.4
+1 -1
View File
@@ -1,6 +1,6 @@
language: ruby language: ruby
rvm: rvm:
- "2.2.3" - "2.2.4"
before_script: rake db:setup before_script: rake db:setup
before_script: bundle exec rake db:setup before_script: bundle exec rake db:setup
cache: bundler cache: bundler
+1 -1
View File
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
#don't upgrade #don't upgrade
gem 'rails', '4.2.5' gem 'rails', '4.2.5'
ruby '2.2.3' ruby '2.2.4'
# Bundle edge Rails instead: # Bundle edge Rails instead:
# gem 'rails', github: 'rails/rails' # gem 'rails', github: 'rails/rails'
+5 -5
View File
@@ -287,10 +287,10 @@ GEM
sprockets (3.5.2) sprockets (3.5.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
sprockets-rails (2.3.3) sprockets-rails (3.0.0)
actionpack (>= 3.0) actionpack (>= 4.0)
activesupport (>= 3.0) activesupport (>= 4.0)
sprockets (>= 2.8, < 4.0) sprockets (>= 3.0.0)
sqlite3 (1.3.11) sqlite3 (1.3.11)
temple (0.7.6) temple (0.7.6)
terminal-table (1.5.2) terminal-table (1.5.2)
@@ -371,4 +371,4 @@ DEPENDENCIES
unicorn unicorn
BUNDLED WITH BUNDLED WITH
1.10.6 1.11.2
+1
View File
@@ -0,0 +1 @@
Rails.application.config.assets.precompile += %w( validation.js jquery.dataTables.js )