diff --git a/.ruby-version b/.ruby-version index 262714f..55bc983 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.4.0 +ruby-2.4.1 diff --git a/Gemfile.lock b/Gemfile.lock index 1a09d29..325752f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,39 +2,39 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actioncable (5.0.4) - actionpack (= 5.0.4) + actioncable (5.0.5) + actionpack (= 5.0.5) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.4) - actionpack (= 5.0.4) - actionview (= 5.0.4) - activejob (= 5.0.4) + actionmailer (5.0.5) + actionpack (= 5.0.5) + actionview (= 5.0.5) + activejob (= 5.0.5) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.4) - actionview (= 5.0.4) - activesupport (= 5.0.4) + actionpack (5.0.5) + actionview (= 5.0.5) + activesupport (= 5.0.5) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.4) - activesupport (= 5.0.4) + actionview (5.0.5) + activesupport (= 5.0.5) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.4) - activesupport (= 5.0.4) + activejob (5.0.5) + activesupport (= 5.0.5) globalid (>= 0.3.6) - activemodel (5.0.4) - activesupport (= 5.0.4) - activerecord (5.0.4) - activemodel (= 5.0.4) - activesupport (= 5.0.4) + activemodel (5.0.5) + activesupport (= 5.0.5) + activerecord (5.0.5) + activemodel (= 5.0.5) + activesupport (= 5.0.5) arel (~> 7.0) - activesupport (5.0.4) + activesupport (5.0.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) @@ -43,7 +43,7 @@ GEM public_suffix (~> 2.0, >= 2.0.2) arel (7.1.4) ast (2.3.0) - autoprefixer-rails (7.1.2.3) + autoprefixer-rails (7.1.2.4) execjs axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -58,9 +58,9 @@ GEM sass (>= 3.4.19) builder (3.2.3) byebug (9.0.6) - capybara (2.14.4) + capybara (2.15.1) addressable - mime-types (>= 1.16) + mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) @@ -156,6 +156,7 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) + mini_mime (0.1.3) mini_portile2 (2.2.0) minitest (5.10.3) msgpack (1.1.0) @@ -178,7 +179,7 @@ GEM omniauth (1.6.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) - omniauth-google-oauth2 (0.5.1) + omniauth-google-oauth2 (0.5.2) jwt (~> 1.5) multi_json (~> 1.3) omniauth (>= 1.1.1) @@ -192,7 +193,7 @@ GEM overcommit (0.40.0) childprocess (~> 0.6, >= 0.6.3) iniparse (~> 1.4) - parallel (1.11.2) + parallel (1.12.0) parser (2.4.0.0) ast (~> 2.2) pg (0.21.0) @@ -206,17 +207,17 @@ GEM rack (2.0.3) rack-test (0.6.3) rack (>= 1.0) - rails (5.0.4) - actioncable (= 5.0.4) - actionmailer (= 5.0.4) - actionpack (= 5.0.4) - actionview (= 5.0.4) - activejob (= 5.0.4) - activemodel (= 5.0.4) - activerecord (= 5.0.4) - activesupport (= 5.0.4) - bundler (>= 1.3.0, < 2.0) - railties (= 5.0.4) + rails (5.0.5) + actioncable (= 5.0.5) + actionmailer (= 5.0.5) + actionpack (= 5.0.5) + actionview (= 5.0.5) + activejob (= 5.0.5) + activemodel (= 5.0.5) + activerecord (= 5.0.5) + activesupport (= 5.0.5) + bundler (>= 1.3.0) + railties (= 5.0.5) sprockets-rails (>= 2.0.0) rails-assets-tether (1.4.0) rails-controller-testing (1.0.2) @@ -228,9 +229,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (5.0.4) - actionpack (= 5.0.4) - activesupport (= 5.0.4) + railties (5.0.5) + actionpack (= 5.0.5) + activesupport (= 5.0.5) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -239,7 +240,7 @@ GEM rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - reek (4.7.1) + reek (4.7.2) codeclimate-engine-rb (~> 0.4.0) parser (>= 2.4.0.0, < 2.5) rainbow (~> 2.0) @@ -324,7 +325,7 @@ GEM temple (0.8.0) thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.7) + tilt (2.0.8) turbolinks (5.0.1) turbolinks-source (~> 5) turbolinks-source (5.0.3) diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index 52fb622..3add03f 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -16,6 +16,17 @@ html })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); ga('create', 'UA-102898465-2', 'auto'); ga('send', 'pageview'); + /HotJar + javascript: + (function(h,o,t,j,a,r){ + h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)}; + h._hjSettings={hjid:747359,hjsv:6}; + a=o.getElementsByTagName('head')[0]; + r=o.createElement('script');r.async=1; + r.src=t+h._hjSettings.hjid+j+h._hjSettings.hjsv; + a.appendChild(r); + })(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv='); + body .container - if user_signed_in? diff --git a/app/views/layouts/pages.html.slim b/app/views/layouts/pages.html.slim index 02fa7ed..b89f528 100644 --- a/app/views/layouts/pages.html.slim +++ b/app/views/layouts/pages.html.slim @@ -16,6 +16,17 @@ html })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); ga('create', 'UA-102898465-2', 'auto'); ga('send', 'pageview'); + /HotJar + javascript: + (function(h,o,t,j,a,r){ + h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)}; + h._hjSettings={hjid:747359,hjsv:6}; + a=o.getElementsByTagName('head')[0]; + r=o.createElement('script');r.async=1; + r.src=t+h._hjSettings.hjid+j+h._hjSettings.hjsv; + a.appendChild(r); + })(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv='); + body .container - if user_signed_in? diff --git a/db/migrate/20170719180335_destroy_public_activities_table.rb b/db/migrate/20170719180335_destroy_public_activities_table.rb index fad61bc..21c92e9 100644 --- a/db/migrate/20170719180335_destroy_public_activities_table.rb +++ b/db/migrate/20170719180335_destroy_public_activities_table.rb @@ -1,6 +1,6 @@ class DestroyPublicActivitiesTable < ActiveRecord::Migration[5.0] def up - drop_table :activities + # drop_table :activities end def down