diff --git a/Gemfile b/Gemfile index 31a05e4..dd3f214 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -ruby '2.2.0' +ruby '2.4.0' gem 'airbrake' gem 'autoprefixer-rails' @@ -19,7 +19,7 @@ gem 'kaminari' gem 'pg' gem 'puma' gem 'pundit' -gem 'rails', '~> 4.2.0' +gem 'rails', '~> 5.0.0' gem 'redcarpet' gem 'responders' gem 'rest-client' @@ -31,6 +31,7 @@ gem 'virtus' gem 'yajl-ruby', require: 'yajl' gem 'yandex-translator' gem 'rack-cors', require: 'rack/cors' +gem 'webpacker' group :development do gem 'better_errors' diff --git a/Gemfile.lock b/Gemfile.lock index 751cb76..1aa208d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,54 +2,56 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actionmailer (4.2.0) - actionpack (= 4.2.0) - actionview (= 4.2.0) - activejob (= 4.2.0) + actioncable (5.0.2) + actionpack (= 5.0.2) + nio4r (>= 1.2, < 3.0) + websocket-driver (~> 0.6.1) + actionmailer (5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.0) - actionview (= 4.2.0) - activesupport (= 4.2.0) - rack (~> 1.6.0) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - actionview (4.2.0) - activesupport (= 4.2.0) + rails-dom-testing (~> 2.0) + actionpack (5.0.2) + actionview (= 5.0.2) + activesupport (= 5.0.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.2) + activesupport (= 5.0.2) builder (~> 3.1) erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.0) - activesupport (= 4.2.0) - globalid (>= 0.3.0) - activemodel (4.2.0) - activesupport (= 4.2.0) - builder (~> 3.1) - activerecord (4.2.0) - activemodel (= 4.2.0) - activesupport (= 4.2.0) - arel (~> 6.0) - activesupport (4.2.0) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.0.2) + activesupport (= 5.0.2) + globalid (>= 0.3.6) + activemodel (5.0.2) + activesupport (= 5.0.2) + activerecord (5.0.2) + activemodel (= 5.0.2) + activesupport (= 5.0.2) + arel (~> 7.0) + activesupport (5.0.2) + 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.4.0) - airbrake (4.1.0) - builder - multi_json - arel (6.0.0) - autoprefixer-rails (5.1.5) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) + airbrake (6.0.0) + airbrake-ruby (~> 2.0) + airbrake-ruby (2.0.0) + arel (7.1.4) + autoprefixer-rails (6.7.7.1) execjs - json axiom-types (0.1.1) descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) - bcrypt (3.1.10) + bcrypt (3.1.11) better_errors (2.1.1) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -59,10 +61,10 @@ GEM bootstrap-kaminari-views (0.0.5) kaminari (>= 0.13) rails (>= 3.1) - bootstrap-switch-rails (3.3.2) - bootstrap-wysihtml5-rails (0.3.3.7) + bootstrap-switch-rails (3.3.3) + bootstrap-wysihtml5-rails (0.3.3.8) railties (>= 3.0) - builder (3.2.2) + builder (3.2.3) capistrano (3.0.1) i18n rake (>= 10.0.0) @@ -76,70 +78,68 @@ GEM capistrano-rbenv (2.0.1) capistrano (~> 3.0) sshkit (~> 1.3) - capybara (2.4.4) + capybara (2.13.0) + addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - celluloid (0.16.0) - timers (~> 4.0.0) cliver (0.3.2) - coderay (1.1.0) + coderay (1.1.1) coercible (1.0.0) descendants_tracker (~> 0.0.1) - coffee-rails (4.1.0) + coffee-rails (4.1.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) + railties (>= 4.0.0, < 5.1.x) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1) - colorize (0.7.5) + coffee-script-source (1.12.2) + concurrent-ruby (1.0.5) crack (0.4.3) safe_yaml (~> 1.0.0) - daemons (1.1.9) - database_cleaner (1.4.0) + daemons (1.2.4) + database_cleaner (1.5.3) debug_inspector (0.0.2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (3.4.1) + devise (4.2.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) + railties (>= 4.1.0, < 5.1) responders - thread_safe (~> 0.1) warden (~> 1.2.3) - diff-lcs (1.2.5) + diff-lcs (1.3) docile (1.1.5) - domain_name (0.5.20160826) + domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) - dotenv (1.0.2) - dotenv-rails (1.0.2) - dotenv (= 1.0.2) - envied (0.8.1) + dotenv (2.2.0) + dotenv-rails (2.2.0) + dotenv (= 2.2.0) + railties (>= 3.2, < 5.1) + envied (0.9.0) coercible (~> 1.0) - rack (~> 1.4) thor (~> 0.15) - equalizer (0.0.9) + equalizer (0.0.11) erubis (2.7.0) - eventmachine (1.0.5) - execjs (2.3.0) - factory_girl (4.5.0) + eventmachine (1.0.9.1) + execjs (2.7.0) + factory_girl (4.8.0) activesupport (>= 3.0.0) - factory_girl_rails (4.5.0) - factory_girl (~> 4.5.0) + factory_girl_rails (4.8.0) + factory_girl (~> 4.8.0) railties (>= 3.0.0) - ffi (1.9.6) + ffi (1.9.18) flutie (2.0.0) - font-awesome-rails (4.3.0.0) - railties (>= 3.2, < 5.0) + font-awesome-rails (4.7.0.1) + railties (>= 3.2, < 5.1) formatador (0.2.5) - globalid (0.3.3) + globalid (0.3.7) activesupport (>= 4.1.0) - guard (2.12.4) + guard (2.14.1) formatador (>= 0.2.4) - listen (~> 2.7) + listen (>= 2.7, < 4.0) lumberjack (~> 1.0) nenv (~> 0.1) notiffany (~> 0.0) @@ -147,241 +147,248 @@ GEM shellany (~> 0.0) thor (>= 0.18.1) guard-compat (1.2.1) - guard-rspec (4.5.0) + guard-rspec (4.7.3) guard (~> 2.1) guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) - hashdiff (0.3.0) - hashie (3.4.0) + haml (4.0.7) + tilt + hashdiff (0.3.2) + hashie (3.5.5) highlight_js-rails (7.1.0) rails (>= 3.1.1) - hike (1.2.3) - hitimes (1.2.2) - http-cookie (1.0.2) + http-cookie (1.0.3) domain_name (~> 0.5) - httparty (0.13.3) - json (~> 1.8) + httparty (0.14.0) multi_xml (>= 0.5.2) - i18n (0.7.0) - ice_nine (0.11.1) - jquery-rails (4.0.3) - rails-dom-testing (~> 1.0) + i18n (0.8.1) + ice_nine (0.11.2) + jquery-rails (4.3.1) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.2) - kaminari (0.16.3) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) - listen (2.8.5) - celluloid (>= 0.15.2) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - loofah (2.0.1) + json (2.0.3) + kaminari (1.0.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.0.1) + kaminari-activerecord (= 1.0.1) + kaminari-core (= 1.0.1) + kaminari-actionview (1.0.1) + actionview + kaminari-core (= 1.0.1) + kaminari-activerecord (1.0.1) + activerecord + kaminari-core (= 1.0.1) + kaminari-core (1.0.1) + listen (3.1.5) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) + loofah (2.0.3) nokogiri (>= 1.5.9) - lumberjack (1.0.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mailcatcher (0.6.1) - activesupport (>= 4.0.0, < 5) - eventmachine (~> 1.0.0, <= 1.0.5) - mail (~> 2.3) - sinatra (~> 1.2) - skinny (~> 0.2.3) - sqlite3 (~> 1.3) - thin (~> 1.5.0) + lumberjack (1.0.11) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mailcatcher (0.2.4) + eventmachine + haml + i18n + json + mail + sinatra + skinny (>= 0.1.2) + sqlite3-ruby + thin method_source (0.8.2) - mime-types (2.4.3) - mini_portile (0.6.2) - minitest (5.5.1) - multi_json (1.11.0) - multi_xml (0.5.5) - nenv (0.2.0) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.10.1) + multi_json (1.12.1) + multi_xml (0.6.0) + nenv (0.3.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.9.2) + net-ssh (4.1.0) netrc (0.11.0) - newrelic_rpm (3.10.0.279) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - notiffany (0.0.6) + newrelic_rpm (4.0.0.332) + nio4r (2.0.0) + nokogiri (1.7.1) + mini_portile2 (~> 2.1.0) + notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) orm_adapter (0.5.0) - pg (0.18.1) - poltergeist (1.6.0) + pg (0.20.0) + poltergeist (1.14.0) capybara (~> 2.1) cliver (~> 0.3.1) - multi_json (~> 1.0) websocket-driver (>= 0.2.0) - pry (0.10.1) + pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) - pry-rails (0.3.3) + pry-rails (0.3.5) pry (>= 0.9.10) - puma (2.11.1) - rack (>= 1.1, < 2.0) - pundit (1.0.1) + public_suffix (2.0.5) + puma (3.8.2) + pundit (1.1.0) activesupport (>= 3.0.0) - rack (1.6.0) - rack-cors (0.4.0) - rack-protection (1.5.3) - rack + rack (2.0.1) + rack-cors (0.4.1) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.0) - actionmailer (= 4.2.0) - actionpack (= 4.2.0) - actionview (= 4.2.0) - activejob (= 4.2.0) - activemodel (= 4.2.0) - activerecord (= 4.2.0) - activesupport (= 4.2.0) + rails (5.0.2) + actioncable (= 5.0.2) + actionmailer (= 5.0.2) + actionpack (= 5.0.2) + actionview (= 5.0.2) + activejob (= 5.0.2) + activemodel (= 5.0.2) + activerecord (= 5.0.2) + activesupport (= 5.0.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.0) - sprockets-rails - rails-assets-bootstrap-sass (3.3.5) - rails-assets-jquery (>= 1.9.0) + railties (= 5.0.2) + sprockets-rails (>= 2.0.0) + rails-assets-bootstrap-sass (3.3.7) + rails-assets-jquery (>= 1.9.1, < 4) rails-assets-jcrop (0.9.12) - rails-assets-jquery (2.1.4) - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.5) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.1) + rails-assets-jquery (3.2.1) + rails-dom-testing (2.0.2) + activesupport (>= 4.2.0, < 6.0) + nokogiri (~> 1.6) + rails-html-sanitizer (1.0.3) loofah (~> 2.0) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging - rails_serve_static_assets (0.0.4) - rails_stdout_logging (0.0.3) - railties (4.2.0) - actionpack (= 4.2.0) - activesupport (= 4.2.0) + rails_serve_static_assets (0.0.5) + rails_stdout_logging (0.0.5) + railties (5.0.2) + actionpack (= 5.0.2) + activesupport (= 5.0.2) + method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.2) - rb-fsevent (0.9.4) - rb-inotify (0.9.5) + rake (12.0.0) + rb-fsevent (0.9.8) + rb-inotify (0.9.8) ffi (>= 0.5.0) - redcarpet (3.2.2) - responders (2.1.0) - railties (>= 4.2.0, < 5) - rest-client (2.0.0) + redcarpet (3.4.0) + responders (2.3.0) + railties (>= 4.2.0, < 5.1) + rest-client (2.0.1) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rspec (3.2.0) - rspec-core (~> 3.2.0) - rspec-expectations (~> 3.2.0) - rspec-mocks (~> 3.2.0) - rspec-core (3.2.1) - rspec-support (~> 3.2.0) - rspec-expectations (3.2.0) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.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.2.0) - rspec-mocks (3.2.1) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.2.0) - rspec-rails (3.2.1) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.2.0) - rspec-expectations (~> 3.2.0) - rspec-mocks (~> 3.2.0) - rspec-support (~> 3.2.0) - rspec-support (3.2.2) + 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) + ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.4.13) - sass-rails (5.0.1) - railties (>= 4.0.0, < 5.0) + sass (3.4.23) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) - tilt (~> 1.1) + tilt (>= 1.1, < 3) shellany (0.0.1) - shoulda-matchers (2.8.0) - activesupport (>= 3.0.0) - simple_form (3.1.0) - actionpack (~> 4.0) - activemodel (~> 4.0) + shoulda-matchers (3.1.1) + activesupport (>= 4.0.0) + simple_form (3.4.0) + actionpack (> 4, < 5.1) + activemodel (> 4, < 5.1) simplecov (0.9.2) docile (~> 1.1.0) multi_json (~> 1.0) simplecov-html (~> 0.9.0) simplecov-html (0.9.0) - sinatra (1.4.5) - rack (~> 1.4) - rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) - skinny (0.2.3) + sinatra (1.0) + rack (>= 1.0) + skinny (0.2.4) eventmachine (~> 1.0.0) - thin (~> 1.5.0) - slim (3.0.2) - temple (~> 0.7.3) + thin (>= 1.5, < 1.7) + slim (3.0.7) + temple (~> 0.7.6) tilt (>= 1.3.3, < 2.1) - slim-rails (3.0.1) - actionmailer (>= 3.1, < 5.0) - actionpack (>= 3.1, < 5.0) - activesupport (>= 3.1, < 5.0) - railties (>= 3.1, < 5.0) + slim-rails (3.1.2) + actionpack (>= 3.1) + railties (>= 3.1) slim (~> 3.0) slop (3.6.0) - spring (1.3.6) - sprockets (2.12.3) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.4) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.10) - sshkit (1.6.1) - colorize (>= 0.7.0) + spring (2.0.1) + activesupport (>= 4.2) + 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.13) + sqlite3-ruby (1.3.3) + sqlite3 (>= 1.3.3) + sshkit (1.12.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - temple (0.7.5) - thin (1.5.1) + temple (0.7.7) + thin (1.6.2) daemons (>= 1.0.9) - eventmachine (>= 0.12.6) + eventmachine (>= 1.0.0) rack (>= 1.0.0) - thor (0.19.1) - thread_safe (0.3.5) - tilt (1.4.1) - timers (4.0.1) - hitimes + thor (0.19.4) + thread_safe (0.3.6) + tilt (2.0.7) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.0) - execjs (>= 0.3.0) - json (>= 1.8.0) + uglifier (3.1.9) + execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.7.2) - virtus (1.0.4) + virtus (1.0.5) axiom-types (~> 0.1) coercible (~> 1.0) descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) - warden (1.2.3) + warden (1.2.7) rack (>= 1.0) - webmock (2.1.0) + webmock (2.3.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - websocket-driver (0.5.3) + webpacker (1.0) + activesupport (>= 5.0) + multi_json (~> 1.2) + railties (>= 5.0) + websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) xpath (2.0.0) nokogiri (~> 1.3) - yajl-ruby (1.2.1) - yandex-translator (0.3.0) - httparty + yajl-ruby (1.3.0) + yandex-translator (0.3.2) + httparty (>= 0.13.4) PLATFORMS ruby @@ -419,7 +426,7 @@ DEPENDENCIES puma pundit rack-cors - rails (~> 4.2.0) + rails (~> 5.0.0) rails-assets-bootstrap-sass! rails-assets-jcrop (= 0.9.12)! rails_12factor @@ -436,11 +443,12 @@ DEPENDENCIES uglifier (>= 2.5.0) virtus webmock + webpacker yajl-ruby yandex-translator RUBY VERSION - ruby 2.2.0p0 + ruby 2.4.0p0 BUNDLED WITH - 1.13.3 + 1.14.6