diff --git a/Gemfile b/Gemfile index c69876c33..3e55e02f5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' ruby '2.3.0' -gem 'rails', '4.2.5.2' +gem 'rails', '~> 4.2.7.1' gem 'rails-i18n' gem 'rails_12factor' gem "rdiscount" @@ -58,7 +58,7 @@ group :development do end group :development, :test do - gem "rspec-rails", '~> 3.4.0' + gem "rspec-rails", '~> 3.5.2' gem "capybara", '~> 2.4.4' gem "byebug" end diff --git a/Gemfile.lock b/Gemfile.lock index c473dfbb1..3175032c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,36 +19,36 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.5.2) - actionpack (= 4.2.5.2) - actionview (= 4.2.5.2) - activejob (= 4.2.5.2) + actionmailer (4.2.7.1) + actionpack (= 4.2.7.1) + actionview (= 4.2.7.1) + activejob (= 4.2.7.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5.2) - actionview (= 4.2.5.2) - activesupport (= 4.2.5.2) + 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-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.5.2) - activesupport (= 4.2.5.2) + actionview (4.2.7.1) + activesupport (= 4.2.7.1) 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.2) - activesupport (= 4.2.5.2) + activejob (4.2.7.1) + activesupport (= 4.2.7.1) globalid (>= 0.3.0) - activemodel (4.2.5.2) - activesupport (= 4.2.5.2) + activemodel (4.2.7.1) + activesupport (= 4.2.7.1) builder (~> 3.1) - activerecord (4.2.5.2) - activemodel (= 4.2.5.2) - activesupport (= 4.2.5.2) + activerecord (4.2.7.1) + activemodel (= 4.2.7.1) + activesupport (= 4.2.7.1) arel (~> 6.0) - activesupport (4.2.5.2) + activesupport (4.2.7.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -60,7 +60,7 @@ GEM sshkit (>= 1.6.1, != 1.7.0) arbre (1.0.3) activesupport (>= 3.0.0) - arel (6.0.3) + arel (6.0.4) ast (2.0.0) astrolabe (1.3.0) parser (>= 2.2.0.pre.3, < 3.0) @@ -81,7 +81,7 @@ GEM bourbon (3.2.4) sass (~> 3.2) thor - builder (3.2.2) + builder (3.2.3) byebug (4.0.5) columnize (= 0.9.0) capistrano (3.4.0) @@ -110,7 +110,8 @@ GEM execjs coffee-script-source (1.8.0) columnize (0.9.0) - concurrent-ruby (1.0.1) + concurrent-ruby (1.0.5) + crass (1.0.3) daemons (1.1.9) dalli (2.7.2) database_cleaner (1.3.0) @@ -122,7 +123,7 @@ GEM responders thread_safe (~> 0.1) warden (~> 1.2.3) - diff-lcs (1.2.5) + diff-lcs (1.3) domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) dotenv (1.0.2) @@ -156,8 +157,8 @@ GEM actionpack (>= 3.2.13) formtastic_i18n (0.1.1) gli (2.16.0) - 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) @@ -168,7 +169,8 @@ GEM http-cookie (1.0.3) domain_name (~> 0.5) http_accept_language (2.0.2) - i18n (0.7.0) + i18n (0.9.1) + concurrent-ruby (~> 1.0) inherited_resources (1.6.0) actionpack (>= 3.2, < 5) has_scope (~> 0.6.0.rc) @@ -180,7 +182,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.3) railties (>= 3.2.16) - json (1.8.3) + json (1.8.6) kaminari (0.16.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -194,16 +196,18 @@ GEM i18n (~> 0.4) json rest-client - loofah (2.0.3) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.4) - mime-types (>= 1.16, < 4) + mail (2.7.0) + mini_mime (>= 0.1.1) memcachier (0.0.2) - mime-types (3.0) + mime-types (3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0221) + mime-types-data (3.2016.0521) + mini_mime (1.0.0) mini_portile2 (2.0.0) - minitest (5.8.4) + minitest (5.11.1) multi_json (1.11.2) multipart-post (2.0.0) net-scp (1.2.1) @@ -229,25 +233,25 @@ GEM activesupport (>= 3.0.0) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) - rack (1.6.4) + rack (1.6.8) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5.2) - actionmailer (= 4.2.5.2) - actionpack (= 4.2.5.2) - actionview (= 4.2.5.2) - activejob (= 4.2.5.2) - activemodel (= 4.2.5.2) - activerecord (= 4.2.5.2) - activesupport (= 4.2.5.2) + 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) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5.2) + 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-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.3) loofah (~> 2.0) @@ -259,14 +263,14 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.3) rails_stdout_logging (0.0.3) - railties (4.2.5.2) - actionpack (= 4.2.5.2) - activesupport (= 4.2.5.2) + railties (4.2.7.1) + actionpack (= 4.2.7.1) + activesupport (= 4.2.7.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.0.0) raindrops (0.16.0) - rake (11.1.1) + rake (12.3.0) ransack (1.6.3) actionpack (>= 3.0) activerecord (>= 3.0) @@ -282,23 +286,23 @@ GEM netrc (~> 0.8) rollbar (2.8.3) multi_json - rspec-core (3.4.1) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.1) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-rails (3.4.0) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) + rspec-support (~> 3.5.0) + rspec-rails (3.5.2) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) rubocop (0.28.0) astrolabe (~> 1.3) parser (>= 2.2.0.pre.7, < 3.0) @@ -324,10 +328,10 @@ GEM simple_form (3.1.0) actionpack (~> 4.0) activemodel (~> 4.0) - sprockets (3.5.2) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.4) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -338,13 +342,13 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0) rack (~> 1.0) - thor (0.19.1) - thread_safe (0.3.5) + thor (0.19.4) + thread_safe (0.3.6) tilt (2.0.2) travis-lint (2.0.0) json ttfunk (1.4.0) - tzinfo (1.2.2) + tzinfo (1.2.4) thread_safe (~> 0.1) uglifier (2.7.2) execjs (>= 0.3.0) @@ -409,13 +413,13 @@ DEPENDENCIES prawn-table pundit quiet_assets - rails (= 4.2.5.2) + rails (~> 4.2.7.1) rails-i18n rails_12factor rake rdiscount rollbar (= 2.8.3) - rspec-rails (~> 3.4.0) + rspec-rails (~> 3.5.2) rubocop sass-rails (~> 5.0.1) select2-rails @@ -428,5 +432,8 @@ DEPENDENCIES web-console (= 2.1.3) whenever +RUBY VERSION + ruby 2.3.0p0 + BUNDLED WITH - 1.11.2 + 1.16.1