From 893105fc0f1b6d44f8c45e6f69f93af1a449c5b8 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Sat, 26 Dec 2015 18:35:20 -0500 Subject: [PATCH 1/7] Upgraded Ruby to 2.3.0 --- .rvmrc | 1 + .travis.yml | 2 +- Gemfile | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 .rvmrc diff --git a/.rvmrc b/.rvmrc new file mode 100644 index 0000000..d3d5ee5 --- /dev/null +++ b/.rvmrc @@ -0,0 +1 @@ +rvm use 2.3.0@ruby2.3.0-rails4.2 --create diff --git a/.travis.yml b/.travis.yml index ca5c29e..c9f9246 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: - - "2.2.4" + - "2.3.0" before_script: rake db:setup before_script: bundle exec rake db:setup cache: bundler diff --git a/Gemfile b/Gemfile index 11da863..ba7f519 100755 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' #don't upgrade gem 'rails', '4.2.5' -ruby '2.2.4' +ruby '2.3.0' # Bundle edge Rails instead: # gem 'rails', github: 'rails/rails' From 18b56cb2a28dc0e156c09850e52e7ed6f7a7b496 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Tue, 29 Dec 2015 11:00:30 -0500 Subject: [PATCH 2/7] Upgraded rb-fsevent gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ca082b3..a302ca6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -233,7 +233,7 @@ GEM thor (>= 0.18.1, < 2.0) raindrops (0.15.0) rake (10.4.2) - rb-fsevent (0.9.6) + rb-fsevent (0.9.7) rb-inotify (0.9.5) ffi (>= 0.5.0) ref (2.0.0) From 399a1d66132a07f12d4418d93151229504002c98 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Sat, 2 Jan 2016 15:18:42 -0500 Subject: [PATCH 3/7] Upgraded lumberjack gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a302ca6..f431d04 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -162,7 +162,7 @@ GEM rb-inotify (>= 0.9) loofah (2.0.3) nokogiri (>= 1.5.9) - lumberjack (1.0.9) + lumberjack (1.0.10) mail (2.6.3) mime-types (>= 1.16, < 3) mailcatcher (0.6.2) From 6b5bc6aaaf4fb9ebec8ad93891c987ee565dfa07 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Tue, 5 Jan 2016 09:32:59 -0500 Subject: [PATCH 4/7] Upgraded tilt gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f431d04..2d2c4f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -305,7 +305,7 @@ GEM rack (>= 1.0.0) thor (0.19.1) thread_safe (0.3.5) - tilt (2.0.1) + tilt (2.0.2) travis-lint (2.0.0) json trollop (2.1.2) From 7616bffad5dc078270b9904b5214695b877a45c1 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 6 Jan 2016 08:59:06 -0500 Subject: [PATCH 5/7] Upgraded childprocess gem --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2d2c4f0..825467c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,7 +71,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - childprocess (0.5.8) + childprocess (0.5.9) ffi (~> 1.0, >= 1.0.11) cliver (0.3.2) coderay (1.1.0) From 1d314d0d33acaabb8c2cd331b6371ae9dee2a3b6 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Wed, 6 Jan 2016 10:04:29 -0500 Subject: [PATCH 6/7] Upgraded .ruby-version to 2.3.0; Delete .rvmrc from repo --- .ruby-version | 2 +- .rvmrc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 .rvmrc diff --git a/.ruby-version b/.ruby-version index 530cdd9..276cbf9 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.2.4 +2.3.0 diff --git a/.rvmrc b/.rvmrc deleted file mode 100644 index d3d5ee5..0000000 --- a/.rvmrc +++ /dev/null @@ -1 +0,0 @@ -rvm use 2.3.0@ruby2.3.0-rails4.2 --create From 8ddcd9691778710da67fead5e9e1cdfa5e43a4c2 Mon Sep 17 00:00:00 2001 From: Al Snow Date: Thu, 7 Jan 2016 13:36:36 -0500 Subject: [PATCH 7/7] Fixed PTO error page --- config/initializers/assets.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 763473d..9e84bb1 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -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 )