Bump bootstrap from 4.5.3 to 4.6.0

Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem) from 4.5.3 to 4.6.0. - [Release notes](https://github.com/twbs/bootstrap-rubygem/releases) - [Changelog](https://github.com/twbs/bootstrap-rubygem/blob/master/CHANGELOG.md) - [Commits](https://github.com/twbs/bootstrap-rubygem/compare/v4.5.3...v4.6.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Merge pull request #198 from projekteuler/dependabot/bundler/bootsnap-1.7.3
2025-12-10 08:46:41 +01:00 · 2021-03-27 08:39:39 +00:00 · 2021-03-27 09:38:08 +01:00 · 2021-03-23 07:39:06 +00:00 · 2021-03-21 13:50:47 +01:00 · 2021-03-08 06:06:04 +00:00
3 changed files with 72 additions and 70 deletions
--- a/6
+++ b/6
@ -2,7 +2,7 @@ source 'https://rubygems.org'


 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '6.1.2'
+gem 'rails', '6.1.3'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '~> 1.4.1'

@ -30,9 +30,9 @@ gem 'jquery-rails', '~> 4.4.0'
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks', '~> 5.2.1'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.10.1'
+gem 'jbuilder', '~> 2.11.2'
 # bundle exec rake doc:rails generates the API under doc/api.
-gem 'sdoc', '~> 2.0.3',          group: :doc
+gem 'sdoc', '~> 2.0.4',          group: :doc

 gem 'web-console', '~> 4.1.0', group: :development
 gem 'listen', '~> 3.4.1', group: :development
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,60 +1,60 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (6.1.2)
-      actionpack (= 6.1.2)
-      activesupport (= 6.1.2)
+    actioncable (6.1.3)
+      actionpack (= 6.1.3)
+      activesupport (= 6.1.3)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.2)
-      actionpack (= 6.1.2)
-      activejob (= 6.1.2)
-      activerecord (= 6.1.2)
-      activestorage (= 6.1.2)
-      activesupport (= 6.1.2)
+    actionmailbox (6.1.3)
+      actionpack (= 6.1.3)
+      activejob (= 6.1.3)
+      activerecord (= 6.1.3)
+      activestorage (= 6.1.3)
+      activesupport (= 6.1.3)
      mail (>= 2.7.1)
-    actionmailer (6.1.2)
-      actionpack (= 6.1.2)
-      actionview (= 6.1.2)
-      activejob (= 6.1.2)
-      activesupport (= 6.1.2)
+    actionmailer (6.1.3)
+      actionpack (= 6.1.3)
+      actionview (= 6.1.3)
+      activejob (= 6.1.3)
+      activesupport (= 6.1.3)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
-    actionpack (6.1.2)
-      actionview (= 6.1.2)
-      activesupport (= 6.1.2)
+    actionpack (6.1.3)
+      actionview (= 6.1.3)
+      activesupport (= 6.1.3)
      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.2)
-      actionpack (= 6.1.2)
-      activerecord (= 6.1.2)
-      activestorage (= 6.1.2)
-      activesupport (= 6.1.2)
+    actiontext (6.1.3)
+      actionpack (= 6.1.3)
+      activerecord (= 6.1.3)
+      activestorage (= 6.1.3)
+      activesupport (= 6.1.3)
      nokogiri (>= 1.8.5)
-    actionview (6.1.2)
-      activesupport (= 6.1.2)
+    actionview (6.1.3)
+      activesupport (= 6.1.3)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.2)
-      activesupport (= 6.1.2)
+    activejob (6.1.3)
+      activesupport (= 6.1.3)
      globalid (>= 0.3.6)
-    activemodel (6.1.2)
-      activesupport (= 6.1.2)
-    activerecord (6.1.2)
-      activemodel (= 6.1.2)
-      activesupport (= 6.1.2)
-    activestorage (6.1.2)
-      actionpack (= 6.1.2)
-      activejob (= 6.1.2)
-      activerecord (= 6.1.2)
-      activesupport (= 6.1.2)
+    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.2)
+    activesupport (6.1.3)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
@ -66,7 +66,7 @@ GEM
      execjs
    bcrypt (3.1.16)
    bindex (0.8.1)
-    bootsnap (1.7.2)
+    bootsnap (1.7.3)
      msgpack (~> 1.0)
    bootstrap (4.6.0)
      autoprefixer-rails (>= 9.1.0)
@ -102,16 +102,16 @@ GEM
    execjs (2.7.0)
    faraday (1.0.0)
      multipart-post (>= 1.2, < 3)
-    ffi (1.14.2)
+    ffi (1.15.0)
    font-awesome-sass (5.15.1)
      sassc (>= 1.11)
    globalid (0.4.2)
      activesupport (>= 4.2.0)
    hashdiff (1.0.1)
    hashie (4.1.0)
-    i18n (1.8.8)
+    i18n (1.8.9)
      concurrent-ruby (~> 1.0)
-    jbuilder (2.10.1)
+    jbuilder (2.11.2)
      activesupport (>= 5.0.0)
    jquery-rails (4.4.0)
      rails-dom-testing (>= 1, < 3)
@ -129,17 +129,19 @@ GEM
    marcel (0.3.3)
      mimemagic (~> 0.3.2)
    method_source (1.0.0)
-    mimemagic (0.3.5)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
    mini_mime (1.0.2)
    mini_portile2 (2.5.0)
-    minitest (5.14.3)
+    minitest (5.14.4)
    msgpack (1.4.2)
    multi_json (1.14.1)
    multi_xml (0.6.0)
    multipart-post (2.1.1)
    mysql2 (0.5.3)
    nio4r (2.5.5)
-    nokogiri (1.11.1)
+    nokogiri (1.11.2)
      mini_portile2 (~> 2.5.0)
      racc (~> 1.4)
    oauth2 (1.4.3)
@ -164,20 +166,20 @@ GEM
    rack (2.2.3)
    rack-test (1.1.0)
      rack (>= 1.0, < 3)
-    rails (6.1.2)
-      actioncable (= 6.1.2)
-      actionmailbox (= 6.1.2)
-      actionmailer (= 6.1.2)
-      actionpack (= 6.1.2)
-      actiontext (= 6.1.2)
-      actionview (= 6.1.2)
-      activejob (= 6.1.2)
-      activemodel (= 6.1.2)
-      activerecord (= 6.1.2)
-      activestorage (= 6.1.2)
-      activesupport (= 6.1.2)
+    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)
      bundler (>= 1.15.0)
-      railties (= 6.1.2)
+      railties (= 6.1.3)
      sprockets-rails (>= 2.0.0)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
@ -191,9 +193,9 @@ GEM
    rails-i18n (6.0.0)
      i18n (>= 0.7, < 2)
      railties (>= 6.0.0, < 7)
-    railties (6.1.2)
-      actionpack (= 6.1.2)
-      activesupport (= 6.1.2)
+    railties (6.1.3)
+      actionpack (= 6.1.3)
+      activesupport (= 6.1.3)
      method_source
      rake (>= 0.8.7)
      thor (~> 1.0)
@ -201,7 +203,7 @@ GEM
    rb-fsevent (0.10.4)
    rb-inotify (0.10.1)
      ffi (~> 1.0)
-    rdoc (6.2.1)
+    rdoc (6.3.0)
    responders (3.0.1)
      actionpack (>= 5.0)
      railties (>= 5.0)
@ -214,7 +216,7 @@ GEM
      sprockets (> 3.0)
      sprockets-rails
      tilt
-    sdoc (2.0.3)
+    sdoc (2.0.4)
      rdoc (>= 5.0)
    simplecov (0.18.1)
      docile (~> 1.1)
@ -244,7 +246,7 @@ GEM
      activemodel (>= 6.0.0)
      bindex (>= 0.4.0)
      railties (>= 6.0.0)
-    webmock (3.11.2)
+    webmock (3.12.1)
      addressable (>= 2.3.6)
      crack (>= 0.3.2)
      hashdiff (>= 0.4.0, < 2.0.0)
@ -269,17 +271,17 @@ DEPENDENCIES
  diff-lcs
  diffy
  font-awesome-sass (~> 5.15.1)
-  jbuilder (~> 2.10.1)
+  jbuilder (~> 2.11.2)
  jquery-rails (~> 4.4.0)
  listen (~> 3.4.1)
  mysql2 (~> 0.5.2)
  omniauth
  omniauth-github
-  rails (= 6.1.2)
+  rails (= 6.1.3)
  rails-controller-testing
  rails-i18n (~> 6.0.0)
  sassc-rails (~> 2.1.2)
-  sdoc (~> 2.0.3)
+  sdoc (~> 2.0.4)
  sqlite3 (~> 1.4.1)
  turbolinks (~> 5.2.1)
  tzinfo-data
--- a/app/scrubbers/translation_content_scrubber.rb
+++ b/app/scrubbers/translation_content_scrubber.rb
@ -3,7 +3,7 @@ class TranslationContentScrubber < Rails::Html::PermitScrubber
    super
    self.tags = %w( strong em b i p code pre tt samp kbd var sub
        sup dfn cite big small address hr br div span h1 h2 h3 h4 h5 h6 ul ol li dl dt dd abbr
-        acronym a img blockquote del ins table th tr td thead tbody tfoot )
+        acronym a img blockquote del ins table th tr td thead tbody tfoot u )
    self.attributes = %w( href src width height alt cite datetime title class name xml:lang abbr style
        align border cellpadding cellspacing colspan )
  end
Author	SHA1	Message	Date
dependabot-preview[bot]	86a7b6525d	Bump bootstrap from 4.5.3 to 4.6.0 Bumps [bootstrap](https://github.com/twbs/bootstrap-rubygem) from 4.5.3 to 4.6.0. - [Release notes](https://github.com/twbs/bootstrap-rubygem/releases) - [Changelog](https://github.com/twbs/bootstrap-rubygem/blob/master/CHANGELOG.md) - [Commits](https://github.com/twbs/bootstrap-rubygem/compare/v4.5.3...v4.6.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-03-27 08:39:39 +00:00
Philipp Fischbeck	21c018ddce	Merge pull request #198 from projekteuler/dependabot/bundler/bootsnap-1.7.3 Bump bootsnap from 1.7.2 to 1.7.3	2021-03-27 09:38:08 +01:00
dependabot-preview[bot]	d2940d667d	Bump bootsnap from 1.7.2 to 1.7.3 Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.7.2 to 1.7.3. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.7.2...v1.7.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-03-23 07:39:06 +00:00
Philipp Fischbeck	12a633bc54	Merge pull request #197 from projekteuler/dependabot/bundler/webmock-3.12.1 Bump webmock from 3.12.0 to 3.12.1	2021-03-21 13:50:47 +01:00
dependabot-preview[bot]	5780c64643	Bump webmock from 3.12.0 to 3.12.1 Bumps [webmock](https://github.com/bblimke/webmock) from 3.12.0 to 3.12.1. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.12.0...v3.12.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-03-08 06:06:04 +00:00
Philipp Fischbeck	a6d74cd0da	Merge pull request #191 from projekteuler/dependabot/bundler/rails-6.1.3 Bump rails from 6.1.2 to 6.1.3	2021-03-01 11:24:59 +01:00
Philipp Fischbeck	e7d739c212	Merge pull request #195 from projekteuler/dependabot/bundler/sdoc-2.0.4 Bump sdoc from 2.0.3 to 2.0.4	2021-03-01 11:23:43 +01:00
Philipp Fischbeck	2f734d851e	Merge pull request #196 from projekteuler/dependabot/bundler/webmock-3.12.0 Bump webmock from 3.11.2 to 3.12.0	2021-03-01 11:23:14 +01:00
dependabot-preview[bot]	49fc0ea601	Bump webmock from 3.11.2 to 3.12.0 Bumps [webmock](https://github.com/bblimke/webmock) from 3.11.2 to 3.12.0. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.11.2...v3.12.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-03-01 07:40:40 +00:00
dependabot-preview[bot]	a0a010e53b	Bump sdoc from 2.0.3 to 2.0.4 Bumps [sdoc](https://github.com/zzak/sdoc) from 2.0.3 to 2.0.4. - [Release notes](https://github.com/zzak/sdoc/releases) - [Changelog](https://github.com/zzak/sdoc/blob/master/CHANGELOG.md) - [Commits](https://github.com/zzak/sdoc/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-02-26 06:33:49 +00:00
Philipp Fischbeck	8f72d768f1	Merge pull request #193 from projekteuler/support-underline Support underline in translations	2021-02-22 15:29:29 +01:00
Philipp Fischbeck	2e2e419938	Support underline in translations	2021-02-22 15:24:28 +01:00
dependabot-preview[bot]	62616d1865	Bump rails from 6.1.2 to 6.1.3 Bumps [rails](https://github.com/rails/rails) from 6.1.2 to 6.1.3. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v6.1.2...v6.1.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-02-18 05:50:50 +00:00
Philipp Fischbeck	686e8d9f46	Merge pull request #183 from projekteuler/dependabot/bundler/jbuilder-2.11.2 Bump jbuilder from 2.10.1 to 2.11.2	2021-02-10 10:47:32 +01:00
dependabot-preview[bot]	067a7ba907	Bump jbuilder from 2.10.1 to 2.11.2 Bumps [jbuilder](https://github.com/rails/jbuilder) from 2.10.1 to 2.11.2. - [Release notes](https://github.com/rails/jbuilder/releases) - [Changelog](https://github.com/rails/jbuilder/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/jbuilder/compare/v2.10.1...v2.11.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	2021-02-10 09:41:23 +00:00