Merge branch 'main' into migrate-new-tags

publiclab · Apr 16, 2021 · cc8274a · cc8274a
2 parents 909ffcb + ebaad12
commit cc8274a
Show file tree

Hide file tree

Showing 30 changed files with 1,346 additions and 199 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -8,7 +8,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6 # Not needed with a .ruby-version file
+        ruby-version: 2.6.6 # Not needed with a .ruby-version file
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically (not working?)
     - uses: ./.github/actions/setup-test-environment
     - name: "Unit Tests"
@@ -36,7 +36,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6 # Not needed with a .ruby-version file
+        ruby-version: 2.6.6 # Not needed with a .ruby-version file
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically (not working?)
     - uses: ./.github/actions/setup-test-environment
     - name: Install JavaScript dependencies with Yarn
@@ -46,7 +46,7 @@ jobs:
         RAILS_ENV: test
         DB_PASSWORD: root
         DB_PORT: ${{ job.services.mysql.ports[3306] }}
-      run: bundle exec rails g webpack:install && bundle exec rails g webpack:install:react && bundle exec rails g react:install
+      run: bundle exec rails g webpacker:install && bundle exec rails g webpacker:install:react && bundle exec rails g react:install
     - name: "Functional Tests"
       env:
         RAILS_ENV: test
@@ -60,7 +60,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6 # Not needed with a .ruby-version file
+        ruby-version: 2.6.6 # Not needed with a .ruby-version file
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically (not working?)
     - uses: ./.github/actions/setup-test-environment
     - name: Install JavaScript dependencies with Yarn
@@ -70,7 +70,7 @@ jobs:
         RAILS_ENV: test
         DB_PASSWORD: root
         DB_PORT: ${{ job.services.mysql.ports[3306] }}
-      run: bundle exec rails g webpack:install && bundle exec rails g webpack:install:react && bundle exec rails g react:install
+      run: bundle exec rails g webpacker:install && bundle exec rails g webpacker:install:react && bundle exec rails g react:install
     - name: "Integration Tests"
       env:
         RAILS_ENV: test
@@ -96,7 +96,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6 # Not needed with a .ruby-version file
+        ruby-version: 2.6.6 # Not needed with a .ruby-version file
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically (not working?)
     - uses: nanasess/setup-chromedriver@v1.0.1
     - uses: ./.github/actions/setup-test-environment
@@ -107,7 +107,7 @@ jobs:
         RAILS_ENV: test
         DB_PASSWORD: root
         DB_PORT: ${{ job.services.mysql.ports[3306] }}
-      run: bundle exec rails g webpack:install && bundle exec rails g webpack:install:react && bundle exec rails g react:install
+      run: bundle exec rails g webpacker:install && bundle exec rails g webpacker:install:react && bundle exec rails g react:install
     - name: "System Tests"
       env:
         RAILS_ENV: test

diff --git a/.gitpod.yml b/.gitpod.yml
@@ -18,7 +18,7 @@ tasks:
 
         yarn install
 
-        rails g webpack:install && rails g webpack:install:react && rails g react:install
+        rails g webpacker:install && rails g webpacker:install:react && rails g react:install
 
       command: >
           passenger start

diff --git a/Gemfile b/Gemfile
@@ -28,7 +28,7 @@ gem 'impressionist'
 gem 'jbuilder', '~> 2.11'
 gem 'jquery-rails'
 gem 'mocha', '~> 1.12'
-gem 'mimemagic', '~> 0.3.8'
+gem 'mimemagic', '~> 0.3.10'
 gem 'mustermann' , '1.1.1'
 gem 'omniauth', '~> 1.9'
 gem 'omniauth-facebook', '~> 8.0'
@@ -51,7 +51,7 @@ gem 'rdiscount', '~> 2.2'
 gem 'react-rails'
 gem "recaptcha", require: "recaptcha/rails"
 gem 'responders', '~> 3.0'
-gem 'rubocop', '~> 1.11.0', require: false
+gem 'rubocop', '~> 1.12.1', require: false
 gem "ruby-openid", :require => "openid"
 gem 'sanitize'
 gem 'sentry-raven'
@@ -105,7 +105,7 @@ gem 'grape-rails-cache'
 group :development do
   gem 'byebug', platform: :mri
   gem "letter_opener"
-  gem 'listen', '~> 3.5.0'
+  gem 'listen', '~> 3.5.1'
   gem "nifty-generators"
   gem 'web-console', '>= 3.3.0'
 end

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -195,7 +195,7 @@ GEM
       mustermann-grape (~> 1.0.0)
       rack (>= 1.3.0)
       rack-accept
-    grape-entity (0.8.2)
+    grape-entity (0.9.0)
       activesupport (>= 3.0.0)
       multi_json (>= 1.3.2)
     grape-rails-cache (0.1.2)
@@ -226,7 +226,7 @@ GEM
     http_accept_language (2.1.1)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     i18n-js (3.8.0)
       i18n (>= 0.6.6)
@@ -257,7 +257,7 @@ GEM
     lemmatizer (0.2.2)
     letter_opener (1.7.0)
       launchy (~> 2.2)
-    listen (3.5.0)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loadcss-rails (2.0.1)
@@ -282,8 +282,9 @@ GEM
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
-    mimemagic (0.3.8)
+    mimemagic (0.3.10)
       nokogiri (~> 1)
+      rake
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
     minitest (5.14.4)
@@ -305,7 +306,7 @@ GEM
     netrc (0.11.0)
     nifty-generators (0.4.6)
     nio4r (2.5.5)
-    nokogiri (1.11.1)
+    nokogiri (1.11.3)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     nokogumbo (2.0.4)
@@ -462,7 +463,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
-    rubocop (1.11.0)
+    rubocop (1.12.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -495,7 +496,7 @@ GEM
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
     semantic_range (2.3.1)
-    sentry-raven (3.1.1)
+    sentry-raven (3.1.2)
       faraday (>= 1.0)
     sidekiq (5.2.9)
       connection_pool (~> 2.2, >= 2.2.2)
@@ -631,10 +632,10 @@ DEPENDENCIES
   lazyload-rails
   lemmatizer (~> 0.2.2)
   letter_opener
-  listen (~> 3.5.0)
+  listen (~> 3.5.1)
   loadcss-rails (~> 2.0.1)
   mailman
-  mimemagic (~> 0.3.8)
+  mimemagic (~> 0.3.10)
   minitest-reporters (~> 1.4.3)
   mocha (~> 1.12)
   mustermann (= 1.1.1)
@@ -671,7 +672,7 @@ DEPENDENCIES
   rest-client
   reverse_markdown
   rspec
-  rubocop (~> 1.11.0)
+  rubocop (~> 1.12.1)
   ruby-openid
   sanitize
   sassc (~> 2.4.0)