diff --git a/Gemfile b/Gemfile index b6848993..cb4adad3 100644 --- a/Gemfile +++ b/Gemfile @@ -65,7 +65,7 @@ gem 'social-share-button' gem 'levenshtein-ffi' # Forum -gem 'thredded', '~> 0.13.2' +gem 'thredded' gem 'rails-ujs' gem 'delayed_job_active_record' diff --git a/Gemfile.lock b/Gemfile.lock index 06ec0a89..4d6c57f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,7 +26,7 @@ GEM erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - active_record_union (1.2.0) + active_record_union (1.3.0) activerecord (>= 4.0) activejob (4.2.7.1) activesupport (= 4.2.7.1) @@ -49,7 +49,7 @@ GEM ast (2.3.0) authority (3.2.2) activesupport (>= 3.0.0) - autoprefixer-rails (7.1.2.3) + autoprefixer-rails (7.2.6) execjs aws-sdk (1.66.0) aws-sdk-v1 (= 1.66.0) @@ -93,7 +93,7 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) - concurrent-ruby (1.0.4) + concurrent-ruby (1.0.5) coveralls (0.8.15) json (>= 1.8, < 3) simplecov (~> 0.12.0) @@ -102,7 +102,7 @@ GEM tins (>= 1.6.0, < 2) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.2) + crass (1.0.3) cucumber (2.4.0) builder (>= 2.1.2) cucumber-core (~> 1.5.0) @@ -152,12 +152,12 @@ GEM ffi (1.9.14) filesize (0.1.1) formatador (0.2.5) - friendly_id (5.2.1) + friendly_id (5.2.3) activerecord (>= 4.0.0) gemoji (2.1.0) gherkin (4.0.0) - globalid (0.3.7) - activesupport (>= 4.1.0) + globalid (0.4.1) + activesupport (>= 4.2.0) guard (2.14.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) @@ -175,7 +175,7 @@ GEM guard (~> 2.0) rubocop (~> 0.20) hashdiff (0.3.2) - html-pipeline (2.6.0) + html-pipeline (2.7.1) activesupport (>= 2) nokogiri (>= 1.4) htmlentities (4.3.4) @@ -184,24 +184,25 @@ GEM httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) - i18n (0.8.0) - inline_svg (1.2.2) + i18n (0.9.4) + concurrent-ruby (~> 1.0) + inline_svg (1.3.1) activesupport (>= 3.0) nokogiri (>= 1.6) json (1.8.6) - kaminari (1.0.1) + kaminari (1.1.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) + kaminari-actionview (= 1.1.1) + kaminari-activerecord (= 1.1.1) + kaminari-core (= 1.1.1) + kaminari-actionview (1.1.1) actionview - kaminari-core (= 1.0.1) - kaminari-activerecord (1.0.1) + kaminari-core (= 1.1.1) + kaminari-activerecord (1.1.1) activerecord - kaminari-core (= 1.0.1) - kaminari-core (1.0.1) - kramdown (1.14.0) + kaminari-core (= 1.1.1) + kaminari-core (1.1.1) + kramdown (1.16.2) levenshtein-ffi (1.1.0) ffi (~> 1.9) libv8 (3.16.14.15) @@ -209,11 +210,12 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.0.3) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.10) - mail (2.6.4) - mime-types (>= 1.16, < 4) + mail (2.7.0) + mini_mime (>= 0.1.1) material_icons (2.2.0) railties (>= 3.2) medium-editor-rails (2.3.1) @@ -224,25 +226,26 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) + mini_mime (1.0.0) mini_portile2 (2.3.0) - minitest (5.10.1) + minitest (5.11.3) mixpanel-ruby (2.2.0) moneta (1.0.0) - multi_json (1.12.1) + multi_json (1.13.1) multi_test (0.1.2) multi_xml (0.6.0) mustache (1.0.5) nenv (0.3.0) netrc (0.11.0) newrelic_rpm (4.5.0.337) - nokogiri (1.8.1) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) - nokogumbo (1.4.13) + nokogumbo (1.5.0) nokogiri notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) - onebox (1.8.16) + onebox (1.8.36) fast_blank (>= 1.0.0) htmlentities (~> 4.3) moneta (~> 1.0) @@ -272,7 +275,7 @@ GEM puma (~> 3.0) pundit (1.1.0) activesupport (>= 3.0.0) - rack (1.6.5) + rack (1.6.8) rack-test (0.6.3) rack (>= 1.0) rack-timeout (0.4.2) @@ -289,8 +292,8 @@ GEM sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.8) - activesupport (>= 4.2.0.beta, < 5.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) @@ -329,7 +332,7 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rinku (2.0.2) + rinku (2.0.4) rmagick (2.13.4) rspec (3.5.0) rspec-core (~> 3.5.0) @@ -367,11 +370,15 @@ GEM ruby_dep (1.4.0) rubyzip (1.2.1) safe_yaml (1.0.4) - sanitize (4.5.0) + sanitize (4.6.0) crass (~> 1.0.2) nokogiri (>= 1.4.4) - nokogumbo (~> 1.4.1) - sass (3.4.22) + nokogumbo (~> 1.4) + sass (3.5.5) + 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.6) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -401,7 +408,7 @@ GEM babel-source (>= 5.8.11) babel-transpiler sprockets (>= 3.0.0) - sprockets-rails (3.2.0) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -417,8 +424,8 @@ GEM libv8 (~> 3.16.14.0) ref thor (0.19.4) - thread_safe (0.3.5) - thredded (0.13.2) + thread_safe (0.3.6) + thredded (0.14.1) active_record_union (>= 1.2.0) autoprefixer-rails db_text_search (~> 0.2.0) @@ -442,7 +449,7 @@ GEM tilt (2.0.5) timeago_js (3.0.2) tins (1.12.0) - tzinfo (1.2.2) + tzinfo (1.2.5) thread_safe (~> 0.1) tzinfo-data (1.2016.7) tzinfo (>= 1.0.0) @@ -523,7 +530,7 @@ DEPENDENCIES stripe stripe_event therubyracer - thredded (~> 0.13.2) + thredded tzinfo-data uglifier (>= 1.3.0) webmock diff --git a/app/views/layouts/_sidenav.html.erb b/app/views/layouts/_sidenav.html.erb index d586c486..9aac28f0 100644 --- a/app/views/layouts/_sidenav.html.erb +++ b/app/views/layouts/_sidenav.html.erb @@ -106,7 +106,7 @@ <%= link_to main_app.customization_content_types_path do %> add Customize pages - + <% end %>