diff --git a/Gemfile b/Gemfile index 73982da..005cf22 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,8 @@ gem "omniauth-github-team-member" gem "omniauth-oauth2", "~> 1.3.1" gem "pg" gem "rack-timeout" -gem "rails" +gem "rake", "~> 11" +gem "rails", "~> 4.2" gem "recipient_interceptor" gem "sass-rails" gem "time_for_a_boolean" diff --git a/Gemfile.lock b/Gemfile.lock index 8b916ae..d86a56a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,38 +19,37 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) + actionmailer (4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5) - actionview (= 4.2.5) - activesupport (= 4.2.5) + actionpack (4.2.10) + actionview (= 4.2.10) + activesupport (= 4.2.10) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.5) - activesupport (= 4.2.5) + actionview (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.5) - activesupport (= 4.2.5) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.10) + activesupport (= 4.2.10) globalid (>= 0.3.0) - activemodel (4.2.5) - activesupport (= 4.2.5) + activemodel (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) - activerecord (4.2.5) - activemodel (= 4.2.5) - activesupport (= 4.2.5) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) arel (~> 6.0) - activesupport (4.2.5) + activesupport (4.2.10) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) @@ -59,13 +58,13 @@ GEM activesupport (>= 3.0.0) archive-zip (0.7.0) io-like (~> 0.3.0) - arel (6.0.3) + arel (6.0.4) ast (2.1.0) awesome_print (1.6.1) bourbon (4.2.6) sass (~> 3.4) thor (~> 0.19) - builder (3.2.2) + builder (3.2.3) bundler-audit (0.4.0) bundler (~> 1.2) thor (~> 0.18) @@ -93,9 +92,10 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - concurrent-ruby (1.0.0) + concurrent-ruby (1.0.5) crack (0.4.3) safe_yaml (~> 1.0.0) + crass (1.0.4) database_cleaner (1.5.1) delayed_job (4.1.1) activesupport (>= 3.0, < 5.0) @@ -131,8 +131,8 @@ GEM activesupport capybara i18n - globalid (0.3.6) - activesupport (>= 4.1.0) + globalid (0.4.1) + activesupport (>= 4.2.0) has_scope (0.6.0) actionpack (>= 3.2, < 5) activesupport (>= 3.2, < 5) @@ -141,7 +141,8 @@ GEM high_voltage (2.4.0) highline (1.7.8) honeybadger (2.3.1) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) i18n-tasks (0.9.2) activesupport (>= 4.0.2) ast (>= 2.1.0) @@ -164,7 +165,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - json (1.8.6) + json (2.1.0) jwt (1.5.2) kaminari (0.16.3) actionpack (>= 3.0.0) @@ -172,14 +173,18 @@ GEM kgio (2.10.0) launchy (2.4.3) addressable (~> 2.3) - loofah (2.0.3) + loofah (2.2.2) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.7.0) + mini_mime (>= 0.1.1) method_source (0.8.2) - mime-types (2.99.3) - mini_portile2 (2.1.0) - minitest (5.8.3) + mime-types (3.2.2) + mime-types-data (~> 3.2015) + mime-types-data (3.2018.0812) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) @@ -187,8 +192,8 @@ GEM bourbon (>= 4.0) sass (>= 3.3) newrelic_rpm (3.14.1.311) - nokogiri (1.6.8.1) - mini_portile2 (~> 2.1.0) + nokogiri (1.8.4) + mini_portile2 (~> 2.3.0) normalize-rails (3.0.3) oauth2 (1.0.0) faraday (>= 0.8, < 0.10) @@ -218,41 +223,41 @@ GEM slop (~> 3.4) pry-rails (0.3.4) pry (>= 0.9.10) - rack (1.6.8) + rack (1.6.10) rack-test (0.6.3) rack (>= 1.0) rack-timeout (0.3.2) - rails (4.2.5) - actionmailer (= 4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) - activemodel (= 4.2.5) - activerecord (= 4.2.5) - activesupport (= 4.2.5) + rails (4.2.10) + actionmailer (= 4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) + activemodel (= 4.2.10) + activerecord (= 4.2.10) + activesupport (= 4.2.10) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5) + railties (= 4.2.10) 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-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) - loofah (~> 2.0) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging rails_serve_static_assets (0.0.4) rails_stdout_logging (0.0.4) - railties (4.2.5) - actionpack (= 4.2.5) - activesupport (= 4.2.5) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.15.0) - rake (10.4.2) + rake (11.3.0) ransack (1.7.0) actionpack (>= 3.0) activerecord (>= 3.0) @@ -298,19 +303,19 @@ GEM spring (1.5.0) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.5.2) + sprockets (3.7.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.2.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) term-ansicolor (1.3.2) tins (~> 1.0) terminal-table (1.5.2) - thor (0.19.1) + thor (0.20.0) thread (0.2.2) - thread_safe (0.3.5) + thread_safe (0.3.6) tilt (2.0.1) time_for_a_boolean (0.0.6) activerecord @@ -320,7 +325,7 @@ GEM title (0.0.5) i18n rails (>= 3.1) - tzinfo (1.2.2) + tzinfo (1.2.5) thread_safe (~> 0.1) uglifier (2.7.2) execjs (>= 0.3.0) @@ -369,8 +374,9 @@ DEPENDENCIES pg pry-rails rack-timeout - rails + rails (~> 4.2) rails_12factor + rake (~> 11) recipient_interceptor rspec-rails (~> 3.0) sass-rails