diff --git a/Gemfile b/Gemfile index 7a1bbe4..b0e49a5 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.2.5' +gem 'rails', '5.0.0' # Use sqlite3 as the database for Active Record gem 'sqlite3' # Use Uglifier as compressor for JavaScript assets @@ -11,9 +11,9 @@ gem 'uglifier', '>= 1.3.0' # gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library -gem 'jquery-rails' +gem 'jquery-rails', '>= 4.4.0' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks -gem 'turbolinks' +gem 'turbolinks', '>= 2.5.3' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.0' # Use Puma as the app server @@ -32,7 +32,7 @@ end group :development do # Access an IRB console on exception pages or by using <%= console %> in views - gem 'web-console' + gem 'web-console', '>= 3.1.1' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' end @@ -40,10 +40,10 @@ end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] -gem 'administrate', '0.1.4' +gem 'administrate', '0.3.0' -gem 'sinatra', '1.1.4' +gem 'sinatra', '2.0.0' gem 'festivaltts4r', '0.2.0' -gem 'spree', '3.0.7' +gem 'spree', '3.2.0' gem 'authlogic', '1.4.3' -gem 'devise_invitable', '1.3.4' +gem 'devise_invitable', '1.6.0' diff --git a/Gemfile.lock b/Gemfile.lock index 9631435..17211fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,116 +1,114 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) + actioncable (5.0.0) + actionpack (= 5.0.0) + nio4r (~> 1.2) + websocket-driver (~> 0.6.1) + actionmailer (5.0.0) + actionpack (= 5.0.0) + actionview (= 5.0.0) + activejob (= 5.0.0) 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) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) + actionpack (5.0.0) + actionview (= 5.0.0) + activesupport (= 5.0.0) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.5) - activesupport (= 4.2.5) + actionview (5.0.0) + activesupport (= 5.0.0) 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.5) - activesupport (= 4.2.5) - globalid (>= 0.3.0) - activemerchant (1.47.0) - activesupport (>= 3.2.14, < 5.0.0) + activejob (5.0.0) + activesupport (= 5.0.0) + globalid (>= 0.3.6) + activemerchant (1.107.4) + activesupport (>= 4.2) builder (>= 2.1.2, < 4.0.0) i18n (>= 0.6.9) nokogiri (~> 1.4) - activemodel (4.2.5) - activesupport (= 4.2.5) - builder (~> 3.1) - activerecord (4.2.5) - activemodel (= 4.2.5) - activesupport (= 4.2.5) - arel (~> 6.0) - activesupport (4.2.5) + activemodel (5.0.0) + activesupport (= 5.0.0) + activerecord (5.0.0) + activemodel (= 5.0.0) + activesupport (= 5.0.0) + arel (~> 7.0) + activesupport (5.0.0) + 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) - acts_as_list (0.7.4) + acts-as-taggable-on (4.0.0) + activerecord (>= 4.0) + acts_as_list (0.9.19) activerecord (>= 3.0) - addressable (2.4.0) - administrate (0.1.4) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + administrate (0.3.0) autoprefixer-rails (~> 6.0) + bourbon (~> 4.2) datetime_picker_rails (~> 0.0.7) jquery-rails (~> 4.0) kaminari (~> 0.16) momentjs-rails (~> 2.8) neat (~> 1.1) normalize-rails (~> 3.0) - rails (~> 4.2) + rails (>= 4.2, < 5.1) sass-rails (~> 5.0) selectize-rails (~> 0.6) allison (2.0.3) - arel (6.0.3) + arel (7.1.4) authlogic (1.4.3) activesupport echoe - autoprefixer-rails (6.3.6.1) + autoprefixer-rails (6.7.7.2) execjs - awesome_nested_set (3.0.3) - activerecord (>= 4.0.0, < 5) - bcrypt (3.1.11) - bootstrap-sass (3.3.6) + awesome_nested_set (3.1.4) + activerecord (>= 4.0.0, < 5.3) + bcrypt (3.1.13) + bindex (0.8.1) + bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - bourbon (4.2.7) + bourbon (4.3.4) sass (~> 3.4) thor (~> 0.19) - builder (3.2.2) + builder (3.2.4) byebug (9.0.4) - camertron-eprun (1.1.0) + camertron-eprun (1.1.1) cancancan (1.10.1) - canonical-rails (0.0.11) - rails (>= 3.1, < 5.0) + canonical-rails (0.1.2) + rails (>= 4.1, < 5.1) carmen (1.0.2) activesupport (>= 3.0.0) cldr-plurals-runtime-rb (1.0.1) - climate_control (0.0.3) - activesupport (>= 3.0) + climate_control (0.2.0) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) - coffee-rails (4.1.1) - coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.1.x) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.10.0) - colorize (0.7.7) - concurrent-ruby (1.0.2) - css_parser (1.4.1) + concurrent-ruby (1.1.6) + crass (1.0.6) + css_parser (1.7.1) addressable datetime_picker_rails (0.0.7) momentjs-rails (>= 2.8.1) - debug_inspector (0.0.2) - deface (1.0.2) - colorize (>= 0.5.8) - nokogiri (~> 1.6.0) + deface (1.5.3) + nokogiri (>= 1.6) polyglot - rails (>= 3.1) - devise (4.1.1) + rails (>= 4.1) + rainbow (>= 2.1.0) + devise (4.7.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) + railties (>= 4.1.0) responders warden (~> 1.2.3) - devise_invitable (1.3.4) - actionmailer (>= 3.2.6, < 5) + devise_invitable (1.6.0) + actionmailer (>= 3.2.6) devise (>= 3.2.0) echoe (4.6.6) allison (>= 2.0.3) @@ -121,13 +119,14 @@ GEM execjs (2.7.0) festivaltts4r (0.2.0) hoe (>= 1.3.0) - ffaker (1.32.1) - font-awesome-rails (4.6.3.0) - railties (>= 3.2, < 5.1) + ffaker (2.2.0) + ffi (1.13.1) + font-awesome-rails (4.7.0.5) + railties (>= 3.2, < 6.1) friendly_id (5.1.0) activerecord (>= 4.0.0) - globalid (0.3.6) - activesupport (>= 4.1.0) + globalid (0.4.2) + activesupport (>= 4.2.0) highline (1.6.21) hoe (3.15.0) rake (>= 0.8, < 12.0) @@ -135,241 +134,262 @@ GEM httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jbuilder (2.4.1) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) - jquery-rails (4.1.1) + jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - json (1.8.3) + json (1.8.6) json_pure (1.8.3) - kaminari (0.16.3) + kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) lingq (0.3.1) bundler httparty - loofah (2.0.3) + loofah (2.6.0) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.4) - mime-types (>= 1.16, < 4) - mime-types (3.1) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (1.0.0) + mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_portile2 (2.0.0) - minitest (5.9.0) - momentjs-rails (2.11.1) + mime-types-data (3.2020.0512) + mimemagic (0.3.0) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.14.1) + momentjs-rails (2.20.1) railties (>= 3.1) - monetize (1.4.0) - money (~> 6.7) - money (6.7.1) - i18n (>= 0.6.4, <= 0.7.0) - sixarm_ruby_unaccent (>= 1.1.1, < 2) + monetize (1.9.4) + money (~> 6.12) + money (6.13.7) + i18n (>= 0.6.4, <= 2) multi_json (1.12.1) multi_xml (0.5.5) - neat (1.7.4) - bourbon (>= 4.0) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) + neat (1.9.1) sass (>= 3.3) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) + thor (~> 0.19) + nio4r (1.2.1) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) normalize-rails (3.0.3) orm_adapter (0.5.0) - paperclip (4.2.4) + paperclip (4.3.7) activemodel (>= 3.2.0) activesupport (>= 3.2.0) cocaine (~> 0.5.5) mime-types - paranoia (2.1.5) - activerecord (~> 4.0) - polyamorous (1.3.0) - activerecord (>= 3.0) + mimemagic (= 0.3.0) + paranoia (2.2.1) + activerecord (>= 4.0, < 5.1) polyglot (0.3.5) - premailer (1.8.6) - css_parser (>= 1.3.6) + premailer (1.11.1) + addressable + css_parser (>= 1.6.0) htmlentities (>= 4.0.0) - premailer-rails (1.9.2) - actionmailer (>= 3, < 6) + premailer-rails (1.11.1) + actionmailer (>= 3) premailer (~> 1.7, >= 1.7.9) + public_suffix (4.0.5) puma (3.4.0) - rabl (0.11.8) + rabl (0.13.1) activesupport (>= 2.3.14) - rack (1.6.4) + rack (2.2.3) + rack-protection (2.0.0) + rack rack-test (0.6.3) rack (>= 1.0) - 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 (5.0.0) + actioncable (= 5.0.0) + actionmailer (= 5.0.0) + actionpack (= 5.0.0) + actionview (= 5.0.0) + activejob (= 5.0.0) + activemodel (= 5.0.0) + activerecord (= 5.0.0) + activesupport (= 5.0.0) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5) - 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) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.5) - actionpack (= 4.2.5) - activesupport (= 4.2.5) + railties (= 5.0.0) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (5.0.0) + actionpack (= 5.0.0) + activesupport (= 5.0.0) + method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (11.1.2) - ransack (1.4.1) - actionpack (>= 3.0) - activerecord (>= 3.0) - activesupport (>= 3.0) + rainbow (3.0.0) + rake (11.3.0) + ransack (1.8.10) + actionpack (>= 3.0, < 5.2) + activerecord (>= 3.0, < 5.2) + activesupport (>= 3.0, < 5.2) i18n - polyamorous (~> 1.1) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) rdoc (4.2.2) json (~> 1.4) - responders (2.2.0) - railties (>= 4.2.0, < 5.1) + responders (3.0.1) + actionpack (>= 5.0) + railties (>= 5.0) + ruby2_keywords (0.0.2) rubyforge (2.0.4) json_pure (>= 1.1.7) - sass (3.4.22) - sass-rails (5.0.4) - railties (>= 4.0.0, < 5.0) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) select2-rails (3.5.9.1) thor (~> 0.14) - selectize-rails (0.12.1) - sinatra (1.1.4) - rack (~> 1.1) - tilt (>= 1.2.2, < 2.0) - sixarm_ruby_unaccent (1.1.1) - spree (3.0.7) - spree_api (= 3.0.7) - spree_backend (= 3.0.7) - spree_cmd (= 3.0.7) - spree_core (= 3.0.7) - spree_frontend (= 3.0.7) - spree_sample (= 3.0.7) - spree_api (3.0.7) - rabl (~> 0.11.6) - spree_core (= 3.0.7) - versioncake (~> 2.3.1) - spree_backend (3.0.7) + selectize-rails (0.12.6) + sinatra (2.0.0) + mustermann (~> 1.0) + rack (~> 2.0) + rack-protection (= 2.0.0) + tilt (~> 2.0) + spree (3.2.0) + spree_api (= 3.2.0) + spree_backend (= 3.2.0) + spree_cmd (= 3.2.0) + spree_core (= 3.2.0) + spree_frontend (= 3.2.0) + spree_sample (= 3.2.0) + spree_api (3.2.0) + rabl (~> 0.13.1) + spree_core (= 3.2.0) + versioncake (~> 3.1.0) + spree_backend (3.2.0) bootstrap-sass (~> 3.3) jquery-rails (~> 4.1) jquery-ui-rails (~> 5.0) select2-rails (= 3.5.9.1) - spree_api (= 3.0.7) - spree_core (= 3.0.7) - spree_cmd (3.0.7) + spree_api (= 3.2.0) + spree_core (= 3.2.0) + spree_cmd (3.2.0) thor (~> 0.14) - spree_core (3.0.7) - activemerchant (~> 1.47.0) - acts_as_list (~> 0.6) - awesome_nested_set (~> 3.0.1) + spree_core (3.2.0) + activemerchant (~> 1.59) + acts-as-taggable-on (~> 4.0) + acts_as_list (~> 0.8) + awesome_nested_set (~> 3.1.1) cancancan (~> 1.10.1) carmen (~> 1.0.0) - deface (~> 1.0.0) - ffaker (~> 1.16) + deface (~> 1.0) + ffaker (~> 2.2.0) font-awesome-rails (~> 4.0) friendly_id (~> 5.1.0) highline (~> 1.6.18) - json (~> 1.7) - kaminari (~> 0.15, >= 0.15.1) + kaminari (~> 0.17) monetize (~> 1.1) - paperclip (~> 4.2.0) - paranoia (~> 2.1.0) + paperclip (~> 4.3.0) + paranoia (~> 2.2.0.pre) premailer-rails - rails (~> 4.2.2) - ransack (~> 1.4.1) + rails (~> 5.0.0) + ransack (~> 1.8.0) responders - sprockets-rails (~> 2.0) + sprockets-rails state_machines-activerecord (~> 0.2) stringex - truncate_html (= 0.9.2) twitter_cldr (~> 3.0) - spree_frontend (3.0.7) + spree_frontend (3.2.0) bootstrap-sass (>= 3.3.5.1, < 3.4) - canonical-rails (~> 0.0.4) + canonical-rails (~> 0.1.0) jquery-rails (~> 4.1) - spree_api (= 3.0.7) - spree_core (= 3.0.7) - spree_sample (3.0.7) - spree_core (= 3.0.7) + spree_api (= 3.2.0) + spree_core (= 3.2.0) + spree_sample (3.2.0) + spree_core (= 3.2.0) spring (1.7.1) - sprockets (3.6.0) + 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) sqlite3 (1.3.11) - state_machines (0.4.0) - state_machines-activemodel (0.4.0) - activemodel (>= 4.1, < 5.1) - state_machines (>= 0.4.0) - state_machines-activerecord (0.4.0) - activerecord (>= 4.1, < 5.1) - state_machines-activemodel (>= 0.3.0) - stringex (2.6.0) - thor (0.19.1) - thread_safe (0.3.5) - tilt (1.4.1) - truncate_html (0.9.2) - turbolinks (2.5.3) - coffee-rails - twitter_cldr (3.3.0) + state_machines (0.5.0) + state_machines-activemodel (0.7.1) + activemodel (>= 4.1) + state_machines (>= 0.5.0) + state_machines-activerecord (0.6.0) + activerecord (>= 4.1) + state_machines-activemodel (>= 0.5.0) + stringex (2.8.5) + thor (0.20.3) + thread_safe (0.3.6) + tilt (2.0.10) + turbolinks (5.2.1) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + twitter_cldr (3.6.0) camertron-eprun - cldr-plurals-runtime-rb (~> 1.0.0) - json + cldr-plurals-runtime-rb (~> 1.0) tzinfo - tzinfo (1.2.2) + tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (3.0.0) execjs (>= 0.3.0, < 3) - versioncake (2.3.1) + versioncake (3.1.0) actionpack (>= 3.2) activesupport (>= 3.2) railties (>= 3.2) tzinfo - warden (1.2.6) - rack (>= 1.0) - web-console (3.1.1) - activemodel (>= 4.2) - debug_inspector - railties (>= 4.2) + warden (1.2.8) + rack (>= 2.0.6) + web-console (3.7.0) + actionview (>= 5.0) + activemodel (>= 5.0) + bindex (>= 0.4.0) + railties (>= 5.0) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) PLATFORMS ruby DEPENDENCIES - administrate (= 0.1.4) + administrate (= 0.3.0) authlogic (= 1.4.3) byebug - devise_invitable (= 1.3.4) + devise_invitable (= 1.6.0) festivaltts4r (= 0.2.0) jbuilder (~> 2.0) - jquery-rails + jquery-rails (>= 4.4.0) lingq puma - rails (= 4.2.5) - sinatra (= 1.1.4) - spree (= 3.0.7) + rails (= 5.0.0) + sinatra (= 2.0.0) + spree (= 3.2.0) spring sqlite3 - turbolinks + turbolinks (>= 2.5.3) tzinfo-data uglifier (>= 1.3.0) - web-console + web-console (>= 3.1.1) BUNDLED WITH - 1.12.4 + 1.17.3