2martens/2martens.de
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:2martens/2martens.de
continuous-integration/drone/push Build was killed
Details

Browse Source
This commit is contained in:
2martens
2021-01-17 14:25:28 +01:00
parent 66750d91ea 719e7ba574
commit fbfbf0acca
3 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile.lock
+25 -23
View File
@@ -8,20 +8,20 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionpack (6.1.0) actionpack (6.1.1)
actionview (= 6.1.0) actionview (= 6.1.1)
activesupport (= 6.1.0) activesupport (= 6.1.1)
rack (~> 2.0, >= 2.0.9) rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.1.0) actionview (6.1.1)
activesupport (= 6.1.0) activesupport (= 6.1.1)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activesupport (6.1.0) activesupport (6.1.1)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
@@ -56,7 +56,7 @@ GEM
html-pipeline (2.13.0) html-pipeline (2.13.0)
activesupport (>= 2) activesupport (>= 2)
nokogiri (>= 1.4) nokogiri (>= 1.4)
html-proofer (3.18.3) html-proofer (3.18.5)
addressable (~> 2.3) addressable (~> 2.3)
mercenary (~> 0.3) mercenary (~> 0.3)
nokogumbo (~> 2.0) nokogumbo (~> 2.0)
@@ -65,7 +65,7 @@ GEM
typhoeus (~> 1.3) typhoeus (~> 1.3)
yell (~> 2.0) yell (~> 2.0)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
i18n (1.8.5) i18n (1.8.7)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jekyll (4.2.0) jekyll (4.2.0)
addressable (~> 2.4) addressable (~> 2.4)
@@ -146,17 +146,18 @@ GEM
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mercenary (0.4.0) mercenary (0.4.0)
method_source (1.0.0) method_source (1.0.0)
mini_portile2 (2.4.0) mini_portile2 (2.5.0)
mini_racer (0.3.1) mini_racer (0.3.1)
libv8 (~> 8.4.255) libv8 (~> 8.4.255)
minima (2.5.1) minima (2.5.1)
jekyll (>= 3.5, < 5.0) jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9) jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1) jekyll-seo-tag (~> 2.1)
minitest (5.14.2) minitest (5.14.3)
multipart-post (2.1.1) multipart-post (2.1.1)
nokogiri (1.10.10) nokogiri (1.11.0)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogumbo (2.0.4) nokogumbo (2.0.4)
nokogiri (~> 1.8, >= 1.8.4) nokogiri (~> 1.8, >= 1.8.4)
octokit (4.18.0) octokit (4.18.0)
@@ -168,6 +169,7 @@ GEM
pathutil (0.16.2) pathutil (0.16.2)
forwardable-extended (~> 2.6) forwardable-extended (~> 2.6)
public_suffix (4.0.6) public_suffix (4.0.6)
racc (1.5.2)
rack (2.2.3) rack (2.2.3)
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
@@ -176,34 +178,34 @@ GEM
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0) rails-html-sanitizer (1.3.0)
loofah (~> 2.3) loofah (~> 2.3)
railties (6.1.0) railties (6.1.1)
actionpack (= 6.1.0) actionpack (= 6.1.1)
activesupport (= 6.1.0) activesupport (= 6.1.1)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (~> 1.0) thor (~> 1.0)
rainbow (3.0.0) rainbow (3.0.0)
rake (13.0.1) rake (13.0.3)
rb-fsevent (0.10.4) rb-fsevent (0.10.4)
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
regexp_parser (2.0.2) regexp_parser (2.0.3)
rexml (3.2.4) rexml (3.2.4)
rouge (3.26.0) rouge (3.26.0)
rubocop (1.7.0) rubocop (1.8.0)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.7.1.5) parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0) regexp_parser (>= 1.8, < 3.0)
rexml rexml
rubocop-ast (>= 1.2.0, < 2.0) rubocop-ast (>= 1.2.0, < 2.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0) unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.3.0) rubocop-ast (1.4.0)
parser (>= 2.7.1.5) parser (>= 2.7.1.5)
ruby-enum (0.8.0) ruby-enum (0.8.0)
i18n i18n
ruby-progressbar (1.10.1) ruby-progressbar (1.11.0)
rubyzip (2.3.0) rubyzip (2.3.0)
safe_yaml (1.0.5) safe_yaml (1.0.5)
sassc (2.4.0) sassc (2.4.0)
@@ -216,7 +218,7 @@ GEM
thor (1.0.1) thor (1.0.1)
typhoeus (1.4.0) typhoeus (1.4.0)
ethon (>= 0.9.0) ethon (>= 0.9.0)
tzinfo (2.0.3) tzinfo (2.0.4)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
unicode-display_width (1.7.0) unicode-display_width (1.7.0)
yell (2.2.2) yell (2.2.2)
package.json
+3 -3
View File
@@ -6,7 +6,7 @@
"dependencies": { "dependencies": {
"bootstrap": "^4.5.3", "bootstrap": "^4.5.3",
"jquery": "^3.5.0", "jquery": "^3.5.0",
"js-yaml": "3.14.1", "js-yaml": "4.0.0",
"popper.js": "^1.16.1" "popper.js": "^1.16.1"
}, },
"devDependencies": { "devDependencies": {
@@ -16,7 +16,7 @@
"braces": "^3.0.2", "braces": "^3.0.2",
"browser-sync": "^2.26.13", "browser-sync": "^2.26.13",
"child_process": "^1.0.2", "child_process": "^1.0.2",
"core-js": "^3.8.1", "core-js": "^3.8.2",
"del": "^6.0.0", "del": "^6.0.0",
"fancy-log": "^1.3.3", "fancy-log": "^1.3.3",
"fstream": "^1.0.12", "fstream": "^1.0.12",
@@ -31,7 +31,7 @@
"gulp-run": "^1.7.1", "gulp-run": "^1.7.1",
"gulp-sass": "^4.0.2", "gulp-sass": "^4.0.2",
"gulp-sourcemaps": "^3.0.0", "gulp-sourcemaps": "^3.0.0",
"gulp-terser": "^2.0.0", "gulp-terser": "^2.0.1",
"localtunnel": "^2.0.0", "localtunnel": "^2.0.0",
"lodash": "^4.17.20", "lodash": "^4.17.20",
"lodash.template": "^4.5.0", "lodash.template": "^4.5.0",
yarn.lock
+21 -9
View File
@@ -1073,6 +1073,11 @@ argparse@^1.0.7:
dependencies: dependencies:
sprintf-js "~1.0.2" sprintf-js "~1.0.2"
argparse@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
arr-diff@^1.0.1: arr-diff@^1.0.1:
version "1.1.0" version "1.1.0"
resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
@@ -2066,10 +2071,10 @@ core-js-compat@^3.8.0:
browserslist "^4.15.0" browserslist "^4.15.0"
semver "7.0.0" semver "7.0.0"
core-js@^3.8.1: core-js@^3.8.2:
version "3.8.1" version "3.8.2"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.1.tgz#f51523668ac8a294d1285c3b9db44025fda66d47" resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.2.tgz#0a1fd6709246da9ca8eff5bb0cbd15fba9ac7044"
integrity sha512-9Id2xHY1W7m8hCl8NkhQn5CufmF/WuR30BTRewvCXc1aZd3kMECwNZ69ndLbekKfakw9Rf2Xyc+QR6E7Gg+obg== integrity sha512-FfApuSRgrR6G5s58casCBd9M2k+4ikuu4wbW6pJyYU7bd9zvFc9qf7vr5xmrZOhT9nn+8uwlH1oRR9jTnFoA3A==
core-util-is@1.0.2, core-util-is@~1.0.0: core-util-is@1.0.2, core-util-is@~1.0.0:
version "1.0.2" version "1.0.2"
@@ -3675,10 +3680,10 @@ gulp-sourcemaps@^3.0.0:
strip-bom-string "^1.0.0" strip-bom-string "^1.0.0"
through2 "^2.0.0" through2 "^2.0.0"
gulp-terser@^2.0.0: gulp-terser@^2.0.1:
version "2.0.0" version "2.0.1"
resolved "https://registry.yarnpkg.com/gulp-terser/-/gulp-terser-2.0.0.tgz#07f95ef9121fe9d4970c3c4ee775c9cd658d0474" resolved "https://registry.yarnpkg.com/gulp-terser/-/gulp-terser-2.0.1.tgz#5f8f4fc54588b79519243809cc8eef4936286d0d"
integrity sha512-8KxzgUpNeLsSujUCrNKUiSI1ioO5TfW4ODhbM+wzNTWgYp7yCIl1c/5EeOI+SOXaNLi+BzzMqrbb0eYMIThFCQ== integrity sha512-XCrnCXP8ovNpgLK9McJIXlgm0j3W2TsiWu7K9y3m+Sn5XZgUzi6U8MPHtS3NdLMic9poCj695N0ARJ2B6atypw==
dependencies: dependencies:
plugin-error "^1.0.1" plugin-error "^1.0.1"
terser "5.4.0" terser "5.4.0"
@@ -4445,7 +4450,14 @@ js-tokens@^4.0.0:
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
js-yaml@3.14.1, js-yaml@^3.13.1: js-yaml@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f"
integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==
dependencies:
argparse "^2.0.1"
js-yaml@^3.13.1:
version "3.14.1" version "3.14.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==