diff --git a/Gemfile b/Gemfile index 29da07f..6c0f90a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source :gemcutter -gem "rails", "~> 2.3.16" +gem "rails", "~> 5.0.0" gem "RedCloth", "~> 4.2.7" gem "heroku-nav", "0.1.24" gem "thin", "1.2.7" diff --git a/Gemfile.lock b/Gemfile.lock index 1b28312..aa8dadb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,42 +2,138 @@ GEM remote: http://rubygems.org/ specs: RedCloth (4.2.9) - actionmailer (2.3.16) - actionpack (= 2.3.16) - actionpack (2.3.16) - activesupport (= 2.3.16) - rack (~> 1.1.0) - activerecord (2.3.16) - activesupport (= 2.3.16) - activeresource (2.3.16) - activesupport (= 2.3.16) - activesupport (2.3.16) - daemons (1.1.9) - eventmachine (1.0.0) + actioncable (5.0.7.2) + actionpack (= 5.0.7.2) + nio4r (>= 1.2, < 3.0) + websocket-driver (~> 0.6.1) + actionmailer (5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (5.0.7.2) + actionview (= 5.0.7.2) + activesupport (= 5.0.7.2) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + actionview (5.0.7.2) + activesupport (= 5.0.7.2) + builder (~> 3.1) + erubis (~> 2.7.0) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.0.7.2) + activesupport (= 5.0.7.2) + globalid (>= 0.3.6) + activemodel (5.0.7.2) + activesupport (= 5.0.7.2) + activerecord (5.0.7.2) + activemodel (= 5.0.7.2) + activesupport (= 5.0.7.2) + arel (~> 7.0) + activesupport (5.0.7.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + arel (7.1.4) + builder (3.2.4) + concurrent-ruby (1.2.2) + crass (1.0.6) + daemons (1.4.1) + date (3.3.3) + erubis (2.7.0) + eventmachine (1.2.7) + globalid (1.1.0) + activesupport (>= 5.0) heroku-nav (0.1.24) json rest-client (>= 1.0) + i18n (1.12.0) + concurrent-ruby (~> 1.0) json (1.7.5) + loofah (2.19.1) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.8.1) + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + method_source (1.0.0) mime-types (1.19) + mini_mime (1.1.2) + mini_portile2 (2.8.1) + minitest (5.18.0) + net-imap (0.3.4) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.1) + timeout + net-smtp (0.3.3) + net-protocol + nio4r (2.5.8) + nokogiri (1.14.2) + mini_portile2 (~> 2.8.0) + racc (~> 1.4) pg (0.14.1) - rack (1.1.5) + racc (1.6.2) + rack (2.2.6.3) rack-ssl-enforcer (0.2.5) - rails (2.3.16) - actionmailer (= 2.3.16) - actionpack (= 2.3.16) - activerecord (= 2.3.16) - activeresource (= 2.3.16) - activesupport (= 2.3.16) - rake (>= 0.8.3) - rake (10.0.3) + rack-test (0.6.3) + rack (>= 1.0) + rails (5.0.7.2) + actioncable (= 5.0.7.2) + actionmailer (= 5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) + activemodel (= 5.0.7.2) + activerecord (= 5.0.7.2) + activesupport (= 5.0.7.2) + bundler (>= 1.3.0) + railties (= 5.0.7.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.5.0) + loofah (~> 2.19, >= 2.19.1) + railties (5.0.7.2) + actionpack (= 5.0.7.2) + activesupport (= 5.0.7.2) + method_source + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + rake (13.0.6) rdoc (3.5.3) redcarpet (1.17.1) rest-client (1.6.7) mime-types (>= 1.16) + sprockets (4.2.0) + concurrent-ruby (~> 1.0) + rack (>= 2.2.4, < 4) + sprockets-rails (3.2.2) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) thin (1.2.7) daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) + thor (1.2.1) + thread_safe (0.3.6) + timeout (0.3.2) + tzinfo (1.2.11) + thread_safe (~> 0.1) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) PLATFORMS ruby @@ -47,7 +143,10 @@ DEPENDENCIES heroku-nav (= 0.1.24) pg (= 0.14.1) rack-ssl-enforcer - rails (~> 2.3.16) + rails (~> 5.0.0) rdoc (~> 3.5.1) redcarpet (= 1.17.1) thin (= 1.2.7) + +BUNDLED WITH + 2.1.4