Merge pull request #215 from jasnow/master

Upgraded Ruby to 2.3.0 and 3 gems.
This commit is contained in:
Ken Johnson
2016-01-07 13:44:49 -05:00
5 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -1 +1 @@
2.2.4 2.3.0
+1 -1
View File
@@ -1,6 +1,6 @@
language: ruby language: ruby
rvm: rvm:
- "2.2.4" - "2.3.0"
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.4' ruby '2.3.0'
# Bundle edge Rails instead: # Bundle edge Rails instead:
# gem 'rails', github: 'rails/rails' # gem 'rails', github: 'rails/rails'
+4 -4
View File
@@ -71,7 +71,7 @@ GEM
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
xpath (~> 2.0) xpath (~> 2.0)
childprocess (0.5.8) childprocess (0.5.9)
ffi (~> 1.0, >= 1.0.11) ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2) cliver (0.3.2)
coderay (1.1.0) coderay (1.1.0)
@@ -162,7 +162,7 @@ GEM
rb-inotify (>= 0.9) rb-inotify (>= 0.9)
loofah (2.0.3) loofah (2.0.3)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
lumberjack (1.0.9) lumberjack (1.0.10)
mail (2.6.3) mail (2.6.3)
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 3)
mailcatcher (0.6.2) mailcatcher (0.6.2)
@@ -233,7 +233,7 @@ GEM
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
raindrops (0.15.0) raindrops (0.15.0)
rake (10.4.2) rake (10.4.2)
rb-fsevent (0.9.6) rb-fsevent (0.9.7)
rb-inotify (0.9.5) rb-inotify (0.9.5)
ffi (>= 0.5.0) ffi (>= 0.5.0)
ref (2.0.0) ref (2.0.0)
@@ -305,7 +305,7 @@ GEM
rack (>= 1.0.0) rack (>= 1.0.0)
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.5) thread_safe (0.3.5)
tilt (2.0.1) tilt (2.0.2)
travis-lint (2.0.0) travis-lint (2.0.0)
json json
trollop (2.1.2) trollop (2.1.2)
+1 -1
View File
@@ -1 +1 @@
Rails.application.config.assets.precompile += %w( validation.js jquery.dataTables.js ) Rails.application.config.assets.precompile += %w( validation.js jquery.dataTables.js fullcalendar.js )