diff --git a/.gitignore b/.gitignore index 7d5434c..ca8a7b1 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ public/system/* *.rdb tags .env +.DS_Store diff --git a/Gemfile b/Gemfile index 364d2e6..115c03d 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby '2.3.1' -gem 'rails', '4.2.7.1' +gem 'rails', '~> 5.0' gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index e50682a..8476859 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,220 +1,238 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.7.1) - actionpack (= 4.2.7.1) - actionview (= 4.2.7.1) - activejob (= 4.2.7.1) + actioncable (5.2.3) + actionpack (= 5.2.3) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailer (5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - 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-dom-testing (~> 2.0) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.7.1) - activesupport (= 4.2.7.1) + actionview (5.2.3) + activesupport (= 5.2.3) 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.7.1) - activesupport (= 4.2.7.1) - globalid (>= 0.3.0) - activemodel (4.2.7.1) - activesupport (= 4.2.7.1) - builder (~> 3.1) - activerecord (4.2.7.1) - activemodel (= 4.2.7.1) - activesupport (= 4.2.7.1) - arel (~> 6.0) - activesupport (4.2.7.1) - i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (5.2.3) + activesupport (= 5.2.3) + globalid (>= 0.3.6) + activemodel (5.2.3) + activesupport (= 5.2.3) + activerecord (5.2.3) + activemodel (= 5.2.3) + activesupport (= 5.2.3) + arel (>= 9.0) + activestorage (5.2.3) + actionpack (= 5.2.3) + activerecord (= 5.2.3) + marcel (~> 0.3.1) + activesupport (5.2.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - arel (6.0.3) - ast (2.3.0) - autoprefixer-rails (6.5.0) + arel (9.0.0) + ast (2.4.0) + autoprefixer-rails (9.6.5) execjs - bcrypt (3.1.11) - better_errors (2.1.1) + bcrypt (3.1.13) + better_errors (2.5.1) coderay (>= 1.0.0) - erubis (>= 2.6.6) + erubi (>= 1.0.0) rack (>= 0.9.0) - binding_of_caller (0.7.2) + binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootstrap-sass (3.3.7) + bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) - builder (3.2.2) - byebug (9.0.5) - childprocess (0.5.9) + sassc (>= 2.0.0) + builder (3.2.3) + byebug (11.0.1) + childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) - chosen-rails (1.5.2) + chosen-rails (1.8.7) coffee-rails (>= 3.2) railties (>= 3.0) sass-rails (>= 3.2) - ckeditor_rails (4.5.10) + ckeditor_rails (4.10.0) railties (>= 3.0) - climate_control (0.0.3) - activesupport (>= 3.0) - cocaine (0.5.8) - climate_control (>= 0.0.3, < 1.0) - coderay (1.1.1) - coffee-rails (4.2.1) + climate_control (0.2.0) + coderay (1.1.2) + coffee-rails (5.0.0) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.2.x) + railties (>= 5.2.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) - concurrent-ruby (1.0.2) - debug_inspector (0.0.2) - devise (4.2.0) + coffee-script-source (1.12.2) + concurrent-ruby (1.1.5) + crass (1.0.5) + debug_inspector (0.0.3) + devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) + railties (>= 4.1.0) responders warden (~> 1.2.3) - erubis (2.7.0) + erubi (1.9.0) execjs (2.7.0) - fancybox2-rails (0.2.8) - railties (>= 3.1.0, < 5.0) - ffi (1.9.14) - globalid (0.3.7) - activesupport (>= 4.1.0) - google-analytics-rails (1.1.0) - i18n (0.7.0) - iniparse (1.4.2) + fancybox2-rails (0.2.7) + railties (>= 3.1.0) + ffi (1.11.1) + globalid (0.4.2) + activesupport (>= 4.2.0) + google-analytics-rails (1.1.1) + i18n (1.7.0) + concurrent-ruby (~> 1.0) + iniparse (1.4.4) + jaro_winkler (1.5.3) jquery-easing-rails (0.0.2) railties (>= 3.1.0) - jquery-rails (4.2.1) + jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (5.0.5) + jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (1.8.3) - loofah (2.0.3) + loofah (2.3.0) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.4) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.1) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (0.9.2) + mime-types (3.3) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mimemagic (0.3.2) - mini_portile2 (2.1.0) - minitest (5.9.1) + mime-types-data (3.2019.1009) + mimemagic (0.3.3) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.12.2) nested_form (0.3.2) - newrelic_rpm (3.16.3.323) - nokogiri (1.6.8) - mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) + newrelic_rpm (6.7.0.359) + nio4r (2.5.2) + nokogiri (1.10.4) + mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) - overcommit (0.36.0) - childprocess (~> 0.5.8) + overcommit (0.47.0) + childprocess (~> 0.6, >= 0.6.3) iniparse (~> 1.4) - paperclip (5.1.0) + paperclip (6.1.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) - cocaine (~> 0.5.5) mime-types mimemagic (~> 0.3.0) - parser (2.3.1.4) - ast (~> 2.2) - pg (0.19.0) - pkg-config (1.1.7) - powerpack (0.1.1) - pry (0.10.4) + terrapin (~> 0.6.0) + parallel (1.18.0) + parser (2.6.5.0) + ast (~> 2.4.0) + pg (1.1.4) + pry (0.12.2) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - puma (3.6.0) - rack (1.6.4) - rack-test (0.6.3) - rack (>= 1.0) - 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.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-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.7.1) - actionpack (= 4.2.7.1) - activesupport (= 4.2.7.1) + method_source (~> 0.9.0) + puma (4.2.1) + nio4r (~> 2.0) + rack (2.0.7) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.2.3) + actioncable (= 5.2.3) + actionmailer (= 5.2.3) + actionpack (= 5.2.3) + actionview (= 5.2.3) + activejob (= 5.2.3) + activemodel (= 5.2.3) + activerecord (= 5.2.3) + activestorage (= 5.2.3) + activesupport (= 5.2.3) + bundler (>= 1.3.0) + railties (= 5.2.3) + 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.2.3) + actionpack (= 5.2.3) + activesupport (= 5.2.3) + method_source rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rainbow (2.1.0) - rake (11.3.0) - responders (2.3.0) - railties (>= 4.2.0, < 5.1) + thor (>= 0.19.0, < 2.0) + rainbow (3.0.0) + rake (13.0.0) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) retina_tag (1.4.1) rails (>= 3.1) - rubocop (0.43.0) - parser (>= 2.3.1.1, < 3.0) - powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) + rubocop (0.75.1) + jaro_winkler (~> 1.5.1) + parallel (~> 1.10) + parser (>= 2.6) + rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.8.1) - sass (3.4.22) - 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, < 3) - simple_form (3.3.1) - actionpack (> 4, < 5.1) - activemodel (> 4, < 5.1) - slim (3.0.7) - temple (~> 0.7.6) - tilt (>= 1.3.3, < 2.1) - slop (3.6.0) - spring (1.7.2) - sprockets (3.7.0) + unicode-display_width (>= 1.4.0, < 1.7) + ruby-progressbar (1.10.1) + sass-rails (6.0.0) + sassc-rails (~> 2.1, >= 2.1.1) + sassc (2.2.1) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt + simple_form (5.0.1) + actionpack (>= 5.0) + activemodel (>= 5.0) + slim (4.0.1) + temple (>= 0.7.6, < 0.9) + tilt (>= 2.0.6, < 2.1) + spring (2.0.2) + activesupport (>= 4.2) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - temple (0.7.7) - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.5) - tzinfo (1.2.2) + temple (0.8.2) + terrapin (0.6.0) + climate_control (>= 0.0.3, < 1.0) + thor (0.20.3) + thread_safe (0.3.6) + tilt (2.0.10) + tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (3.0.2) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.1.1) - warden (1.2.6) - rack (>= 1.0) + unicode-display_width (1.6.0) + warden (1.2.8) + rack (>= 2.0.6) web-console (2.3.0) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) - will_paginate (3.1.3) - will_paginate-bootstrap (1.0.1) + websocket-driver (0.7.1) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.4) + will_paginate (3.2.1) + will_paginate-bootstrap (1.0.2) will_paginate (>= 3.0.3) PLATFORMS @@ -241,7 +259,7 @@ DEPENDENCIES pg pry puma - rails (= 4.2.7.1) + rails (~> 5.0) retina_tag rubocop sass-rails @@ -257,4 +275,4 @@ RUBY VERSION ruby 2.3.1p112 BUNDLED WITH - 1.12.0 + 1.16.6