From bc944d677bab71790335a0d90da430fb2b6978be Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Fri, 28 May 2021 15:54:36 +0200 Subject: [PATCH] Removed cookie warning. Updated Gems. Apparently functional cookies can be used without consent. --- Gemfile | 3 - Gemfile.lock | 181 ++++++++++++------------ app/assets/stylesheets/application.scss | 1 - app/views/layouts/_footer.slim | 2 - 4 files changed, 89 insertions(+), 98 deletions(-) diff --git a/Gemfile b/Gemfile index 9db6635..2809f51 100644 --- a/Gemfile +++ b/Gemfile @@ -113,9 +113,6 @@ gem 'slim-rails' # Attachment/image handling gem "paperclip" -# Comply with stupid european cookie law -gem 'cookies_eu' - # Requires: apt-get install libbz2-dev gem 'bzip2-ruby', :git => 'https://github.com/chewi/bzip2-ruby.git' diff --git a/Gemfile.lock b/Gemfile.lock index 7085b8e..95ee80c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,60 +7,60 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.1.3) - actionpack (= 6.1.3) - activesupport (= 6.1.3) + actioncable (6.1.3.2) + actionpack (= 6.1.3.2) + activesupport (= 6.1.3.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.3) - actionpack (= 6.1.3) - activejob (= 6.1.3) - activerecord (= 6.1.3) - activestorage (= 6.1.3) - activesupport (= 6.1.3) + actionmailbox (6.1.3.2) + actionpack (= 6.1.3.2) + activejob (= 6.1.3.2) + activerecord (= 6.1.3.2) + activestorage (= 6.1.3.2) + activesupport (= 6.1.3.2) mail (>= 2.7.1) - actionmailer (6.1.3) - actionpack (= 6.1.3) - actionview (= 6.1.3) - activejob (= 6.1.3) - activesupport (= 6.1.3) + actionmailer (6.1.3.2) + actionpack (= 6.1.3.2) + actionview (= 6.1.3.2) + activejob (= 6.1.3.2) + activesupport (= 6.1.3.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.3) - actionview (= 6.1.3) - activesupport (= 6.1.3) + actionpack (6.1.3.2) + actionview (= 6.1.3.2) + activesupport (= 6.1.3.2) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.3) - actionpack (= 6.1.3) - activerecord (= 6.1.3) - activestorage (= 6.1.3) - activesupport (= 6.1.3) + actiontext (6.1.3.2) + actionpack (= 6.1.3.2) + activerecord (= 6.1.3.2) + activestorage (= 6.1.3.2) + activesupport (= 6.1.3.2) nokogiri (>= 1.8.5) - actionview (6.1.3) - activesupport (= 6.1.3) + actionview (6.1.3.2) + activesupport (= 6.1.3.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.3) - activesupport (= 6.1.3) + activejob (6.1.3.2) + activesupport (= 6.1.3.2) globalid (>= 0.3.6) - activemodel (6.1.3) - activesupport (= 6.1.3) - activerecord (6.1.3) - activemodel (= 6.1.3) - activesupport (= 6.1.3) - activestorage (6.1.3) - actionpack (= 6.1.3) - activejob (= 6.1.3) - activerecord (= 6.1.3) - activesupport (= 6.1.3) - marcel (~> 0.3.1) - mimemagic (~> 0.3.2) - activesupport (6.1.3) + activemodel (6.1.3.2) + activesupport (= 6.1.3.2) + activerecord (6.1.3.2) + activemodel (= 6.1.3.2) + activesupport (= 6.1.3.2) + activestorage (6.1.3.2) + actionpack (= 6.1.3.2) + activejob (= 6.1.3.2) + activerecord (= 6.1.3.2) + activesupport (= 6.1.3.2) + marcel (~> 1.0.0) + mini_mime (~> 1.0.2) + activesupport (6.1.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -83,14 +83,14 @@ GEM coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - bindata (2.4.8) + bindata (2.4.10) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bootsnap (1.7.2) + bootsnap (1.7.5) msgpack (~> 1.0) builder (3.2.4) byebug (11.1.3) - cancancan (3.2.1) + cancancan (3.2.2) capybara (3.35.3) addressable mini_mime (>= 0.1.3) @@ -105,23 +105,21 @@ GEM coderay (1.1.3) concurrent-ruby (1.1.8) content_disposition (1.0.0) - cookies_eu (1.7.7) - js_cookie_rails (~> 2.2.0) crass (1.0.6) - debug_inspector (1.0.0) - devise (4.7.3) + debug_inspector (1.1.0) + devise (4.8.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - down (5.2.0) + down (5.2.2) addressable (~> 2.5) e2mmap (0.1.0) erubi (1.10.0) - execjs (2.7.0) + execjs (2.8.1) fastimage (2.2.3) - ffi (1.15.0) + ffi (1.15.1) font-awesome-rails (4.7.0.7) railties (>= 3.2, < 7) formatador (0.2.5) @@ -132,7 +130,7 @@ GEM globalid (0.4.2) activesupport (>= 4.2.0) gravtastic (3.2.6) - guard (2.16.2) + guard (2.17.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -150,7 +148,7 @@ GEM guard-compat (~> 1.0) hashie (4.1.0) httpclient (2.8.3) - i18n (1.8.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) image_processing (1.12.1) mini_magick (>= 4.9.5, < 5) @@ -162,14 +160,12 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - js_cookie_rails (2.2.0) - railties (>= 3.1) json (1.8.6) json-jwt (1.13.0) activesupport (>= 4.2) aes_key_wrap bindata - kramdown (2.3.0) + kramdown (2.3.1) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) @@ -177,22 +173,23 @@ GEM listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.9.0) + loofah (2.9.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.2.8) mail (2.7.1) mini_mime (>= 0.1.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) + marcel (1.0.1) method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2021.0225) - mimemagic (0.3.5) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_magick (4.11.0) - mini_mime (1.0.2) - mini_portile2 (2.5.0) + mini_mime (1.0.3) + mini_portile2 (2.5.1) minitest (5.14.4) minitest-rails (6.1.0) minitest (~> 5.10) @@ -205,7 +202,7 @@ GEM msgpack (1.4.2) nenv (0.3.0) nio4r (2.5.7) - nokogiri (1.11.1) + nokogiri (1.11.6) mini_portile2 (~> 2.5.0) racc (~> 1.4) notiffany (0.1.3) @@ -239,20 +236,20 @@ GEM mimemagic (~> 0.3.0) terrapin (~> 0.6.0) parallel (1.20.1) - parser (3.0.0.0) + parser (3.0.1.1) ast (~> 2.4.1) pg (1.2.3) pg_search (2.3.5) activerecord (>= 5.2) activesupport (>= 5.2) - pry (0.14.0) + pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.6) puma (3.12.6) racc (1.5.2) rack (2.2.3) - rack-oauth2 (1.16.0) + rack-oauth2 (1.17.0) activesupport attr_required httpclient @@ -260,20 +257,20 @@ GEM rack (>= 2.1.0) rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.1.3) - actioncable (= 6.1.3) - actionmailbox (= 6.1.3) - actionmailer (= 6.1.3) - actionpack (= 6.1.3) - actiontext (= 6.1.3) - actionview (= 6.1.3) - activejob (= 6.1.3) - activemodel (= 6.1.3) - activerecord (= 6.1.3) - activestorage (= 6.1.3) - activesupport (= 6.1.3) + rails (6.1.3.2) + actioncable (= 6.1.3.2) + actionmailbox (= 6.1.3.2) + actionmailer (= 6.1.3.2) + actionpack (= 6.1.3.2) + actiontext (= 6.1.3.2) + actionview (= 6.1.3.2) + activejob (= 6.1.3.2) + activemodel (= 6.1.3.2) + activerecord (= 6.1.3.2) + activestorage (= 6.1.3.2) + activesupport (= 6.1.3.2) bundler (>= 1.15.0) - railties (= 6.1.3) + railties (= 6.1.3.2) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -283,19 +280,20 @@ GEM activesupport (>= 4.2) choice (~> 0.2.0) ruby-graphviz (~> 1.2) - rails-healthcheck (1.2.0) - rails + rails-healthcheck (1.4.0) + actionpack + railties rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.1.3) - actionpack (= 6.1.3) - activesupport (= 6.1.3) + railties (6.1.3.2) + actionpack (= 6.1.3.2) + activesupport (= 6.1.3.2) method_source rake (>= 0.8.7) thor (~> 1.0) rainbow (3.0.0) rake (13.0.3) - rb-fsevent (0.10.4) + rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) rdoc (4.3.0) @@ -306,23 +304,23 @@ GEM railties (>= 5.0) reverse_markdown (2.0.0) nokogiri - rexml (3.2.4) - rubocop (1.11.0) + rexml (3.2.5) + rubocop (1.15.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.2.0, < 2.0) + rubocop-ast (>= 1.5.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.4.1) - parser (>= 2.7.1.5) + rubocop-ast (1.6.0) + parser (>= 3.0.1.1) ruby-graphviz (1.2.5) rexml ruby-progressbar (1.11.0) - ruby-vips (2.0.17) - ffi (~> 1.9) + ruby-vips (2.1.2) + ffi (~> 1.12) rubyzip (2.3.0) sass (3.7.4) sass-listen (~> 4.0.0) @@ -412,7 +410,7 @@ GEM webfinger (1.1.0) activesupport httpclient (>= 2.4) - websocket-driver (0.7.3) + websocket-driver (0.7.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) will_paginate (3.3.0) @@ -434,7 +432,6 @@ DEPENDENCIES bzip2-ruby! cancancan capybara - cookies_eu devise fastimage font-awesome-rails diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 8e9a1ba..2bcc98b 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -10,7 +10,6 @@ * *= require_self *= require foundation_and_overrides - *= require cookies_eu *= require font-awesome *= require my_styles */ diff --git a/app/views/layouts/_footer.slim b/app/views/layouts/_footer.slim index 82e825e..2538260 100644 --- a/app/views/layouts/_footer.slim +++ b/app/views/layouts/_footer.slim @@ -13,5 +13,3 @@ / a href="http://vexxhost.com/" VEXXHOST // Only for debugging: / ' | Cookie is #{session[:token]} - -= render 'cookies_eu/consent_banner', link: '/about#cookies'