diff --git a/Gemfile b/Gemfile index 0e1a973..fafe455 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' #don't upgrade -gem 'rails', '4.2.7.1' +gem 'rails', '5.0.1' ruby '2.3.3' @@ -53,7 +53,7 @@ gem 'sass-rails' gem 'coffee-rails' gem 'jquery-fileupload-rails' gem 'uglifier' -gem 'turbolinks' # New for Rails 4.0 +gem 'turbolinks' # See https://github.com/sstephenson/execjs#readme for more supported runtimes # gem 'therubyracer', :platforms => :ruby @@ -87,11 +87,12 @@ gem 'execjs' gem 'therubyracer' # Add SMTP server support using MailCatcher -gem 'mailcatcher' +# NOTE: https://github.com/sj26/mailcatcher#bundler +# gem 'mailcatcher' #For Rails 4.0 #group :doc do -# # bundle exec rake doc:rails generates the API under doc/api. +# # bundle exec rails doc:rails generates the API under doc/api. # gem 'sdoc', require: false #end diff --git a/Gemfile.lock b/Gemfile.lock index 7cfff78..8e01d9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,44 +1,46 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.7.1) - actionpack (= 4.2.7.1) - actionview (= 4.2.7.1) - activejob (= 4.2.7.1) + actioncable (5.0.1) + actionpack (= 5.0.1) + nio4r (~> 1.2) + websocket-driver (~> 0.6.1) + actionmailer (5.0.1) + actionpack (= 5.0.1) + actionview (= 5.0.1) + activejob (= 5.0.1) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.7.1) - actionview (= 4.2.7.1) - activesupport (= 4.2.7.1) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) + actionpack (5.0.1) + actionview (= 5.0.1) + activesupport (= 5.0.1) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.7.1) - activesupport (= 4.2.7.1) + actionview (5.0.1) + activesupport (= 5.0.1) builder (~> 3.1) erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.7.1) - activesupport (= 4.2.7.1) - globalid (>= 0.3.0) - activemodel (4.2.7.1) - activesupport (= 4.2.7.1) - builder (~> 3.1) - activerecord (4.2.7.1) - activemodel (= 4.2.7.1) - activesupport (= 4.2.7.1) - arel (~> 6.0) - activesupport (4.2.7.1) + activejob (5.0.1) + activesupport (= 5.0.1) + globalid (>= 0.3.6) + activemodel (5.0.1) + activesupport (= 5.0.1) + activerecord (5.0.1) + activemodel (= 5.0.1) + activesupport (= 5.0.1) + arel (~> 7.0) + activesupport (5.0.1) + concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) - arel (6.0.3) + arel (7.1.4) aruba (0.14.2) childprocess (~> 0.5.6) contracts (~> 0.9) @@ -54,7 +56,7 @@ GEM binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) brakeman (3.4.1) - builder (3.2.2) + builder (3.2.3) bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) @@ -76,7 +78,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.2) + concurrent-ruby (1.0.4) contracts (0.14.0) crack (0.3.1) cucumber (2.4.0) @@ -90,7 +92,6 @@ GEM cucumber-core (1.5.0) gherkin (~> 4.0) cucumber-wire (0.0.1) - daemons (1.2.4) database_cleaner (1.5.3) debug_inspector (0.0.2) diff-lcs (1.2.5) @@ -99,7 +100,7 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.0.9.1) + eventmachine (1.2.1) execjs (2.7.0) ffi (1.9.14) foreman (0.82.0) @@ -143,7 +144,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.3) + json (2.0.3) kgio (2.11.0) launchy (2.4.3) addressable (~> 2.3) @@ -157,14 +158,6 @@ GEM lumberjack (1.0.10) mail (2.6.4) mime-types (>= 1.16, < 4) - mailcatcher (0.6.5) - eventmachine (= 1.0.9.1) - mail (~> 2.3) - rack (~> 1.5) - sinatra (~> 1.2) - skinny (~> 0.2.3) - sqlite3 (~> 1.3) - thin (~> 1.5.0) method_source (0.8.2) mime-types (3.1) mime-types-data (~> 3.2015) @@ -175,7 +168,8 @@ GEM multi_test (0.1.2) mysql2 (0.4.5) nenv (0.3.0) - nokogiri (1.6.8.1) + nio4r (1.2.1) + nokogiri (1.7.0.1) mini_portile2 (~> 2.1.0) notiffany (0.1.1) nenv (~> 0.1) @@ -194,35 +188,32 @@ GEM pry-rails (0.3.4) pry (>= 0.9.10) public_suffix (2.0.4) - rack (1.6.5) + rack (2.0.1) rack-livereload (0.3.16) rack - rack-protection (1.5.3) - rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.7.1) - actionmailer (= 4.2.7.1) - actionpack (= 4.2.7.1) - actionview (= 4.2.7.1) - activejob (= 4.2.7.1) - activemodel (= 4.2.7.1) - activerecord (= 4.2.7.1) - activesupport (= 4.2.7.1) + rails (5.0.1) + actioncable (= 5.0.1) + actionmailer (= 5.0.1) + actionpack (= 5.0.1) + actionview (= 5.0.1) + activejob (= 5.0.1) + activemodel (= 5.0.1) + activerecord (= 5.0.1) + activesupport (= 5.0.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.7.1) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) + railties (= 5.0.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.2) + activesupport (>= 4.2.0, < 6.0) + nokogiri (~> 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.7.1) - actionpack (= 4.2.7.1) - activesupport (= 4.2.7.1) + railties (5.0.1) + actionpack (= 5.0.1) + activesupport (= 5.0.1) + method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.17.0) @@ -268,31 +259,20 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - sinatra (1.4.7) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - skinny (0.2.4) - eventmachine (~> 1.0.0) - thin (>= 1.5, < 1.7) slop (3.6.0) - sprockets (3.7.0) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.0) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.12) + sqlite3 (1.3.13) test-unit (3.2.3) power_assert therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref - thin (1.5.1) - daemons (>= 1.0.9) - eventmachine (>= 0.12.6) - rack (>= 1.0.0) thor (0.19.4) thread_safe (0.3.5) tilt (2.0.5) @@ -337,14 +317,13 @@ DEPENDENCIES jquery-fileupload-rails jquery-rails launchy - mailcatcher mysql2 poltergeist powder pry pry-rails rack-livereload - rails (= 4.2.7.1) + rails (= 5.0.1) rake rb-fsevent responders @@ -363,4 +342,4 @@ RUBY VERSION ruby 2.3.3p222 BUNDLED WITH - 1.13.6 + 1.13.7