From edf9a6d56049e6735d132d1345fdd3fe1bbbd2d9 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Fri, 18 Dec 2015 10:51:26 -0500 Subject: [PATCH] Upgraded ruby to 2.2.4 and gems: sprockets-rails and bundler --- .ruby-version | 2 +- .travis.yml | 2 +- Gemfile | 2 +- Gemfile.lock | 10 +++++----- config/initializers/assets.rb | 1 + 5 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 config/initializers/assets.rb diff --git a/.ruby-version b/.ruby-version index 5859406..530cdd9 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.2.3 +2.2.4 diff --git a/.travis.yml b/.travis.yml index e8f2681..ca5c29e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: - - "2.2.3" + - "2.2.4" before_script: rake db:setup before_script: bundle exec rake db:setup cache: bundler diff --git a/Gemfile b/Gemfile index 63fb194..11da863 100755 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' #don't upgrade gem 'rails', '4.2.5' -ruby '2.2.3' +ruby '2.2.4' # Bundle edge Rails instead: # gem 'rails', github: 'rails/rails' diff --git a/Gemfile.lock b/Gemfile.lock index 16cb14a..cabd88e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -287,10 +287,10 @@ GEM sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (2.3.3) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) + sprockets-rails (3.0.0) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) sqlite3 (1.3.11) temple (0.7.6) terminal-table (1.5.2) @@ -371,4 +371,4 @@ DEPENDENCIES unicorn BUNDLED WITH - 1.10.6 + 1.11.2 diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 0000000..763473d --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1 @@ +Rails.application.config.assets.precompile += %w( validation.js jquery.dataTables.js )