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 is passing
Details

Browse Source
This commit is contained in:
2martens
2021-03-06 10:41:43 +01:00
parent 9ef7b63031 3fca19ce47
commit ce851ed3e8
3 changed files with 764 additions and 804 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile.lock
+19 -19
View File
@@ -8,20 +8,20 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionpack (6.1.1) actionpack (6.1.3)
actionview (= 6.1.1) actionview (= 6.1.3)
activesupport (= 6.1.1) activesupport (= 6.1.3)
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.1) actionview (6.1.3)
activesupport (= 6.1.1) activesupport (= 6.1.3)
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.1) activesupport (6.1.3)
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)
@@ -29,7 +29,7 @@ GEM
zeitwerk (~> 2.3) zeitwerk (~> 2.3)
addressable (2.7.0) addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 5.0)
ast (2.4.1) ast (2.4.2)
builder (3.2.4) builder (3.2.4)
coffee-script (2.4.1) coffee-script (2.4.1)
coffee-script-source coffee-script-source
@@ -38,7 +38,7 @@ GEM
colorator (1.1.0) colorator (1.1.0)
commonmarker (0.17.13) commonmarker (0.17.13)
ruby-enum (~> 0.5) ruby-enum (~> 0.5)
concurrent-ruby (1.1.7) concurrent-ruby (1.1.8)
crass (1.0.6) crass (1.0.6)
em-websocket (0.5.2) em-websocket (0.5.2)
eventmachine (>= 0.12.9) eventmachine (>= 0.12.9)
@@ -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.5) html-proofer (3.18.8)
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.7) i18n (1.8.9)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jekyll (4.2.0) jekyll (4.2.0)
addressable (~> 2.4) addressable (~> 2.4)
@@ -123,8 +123,8 @@ GEM
jekyll (>= 3.7, < 5.0) jekyll (>= 3.7, < 5.0)
jekyll-titles-from-headings (0.5.3) jekyll-titles-from-headings (0.5.3)
jekyll (>= 3.3, < 5.0) jekyll (>= 3.3, < 5.0)
jekyll-toc (0.16.1) jekyll-toc (0.17.0)
jekyll (>= 3.8) jekyll (>= 3.9)
nokogiri (~> 1.10) nokogiri (~> 1.10)
jekyll-watch (2.2.1) jekyll-watch (2.2.1)
listen (~> 3.0) listen (~> 3.0)
@@ -178,9 +178,9 @@ 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.1) railties (6.1.3)
actionpack (= 6.1.1) actionpack (= 6.1.3)
activesupport (= 6.1.1) activesupport (= 6.1.3)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (~> 1.0) thor (~> 1.0)
@@ -189,10 +189,10 @@ GEM
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.3) regexp_parser (2.1.1)
rexml (3.2.4) rexml (3.2.4)
rouge (3.26.0) rouge (3.26.0)
rubocop (1.8.1) rubocop (1.11.0)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 3.0.0.0) parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
@@ -201,7 +201,7 @@ GEM
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, < 3.0) unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.4.0) rubocop-ast (1.4.1)
parser (>= 2.7.1.5) parser (>= 2.7.1.5)
ruby-enum (0.8.0) ruby-enum (0.8.0)
i18n i18n
@@ -215,7 +215,7 @@ GEM
faraday (> 0.8, < 2.0) faraday (> 0.8, < 2.0)
terminal-table (2.0.0) terminal-table (2.0.0)
unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (~> 1.1, >= 1.1.1)
thor (1.0.1) thor (1.1.0)
typhoeus (1.4.0) typhoeus (1.4.0)
ethon (>= 0.9.0) ethon (>= 0.9.0)
tzinfo (2.0.4) tzinfo (2.0.4)
package.json
+7 -7
View File
@@ -4,19 +4,19 @@
"description": "My website", "description": "My website",
"main": "index.js", "main": "index.js",
"dependencies": { "dependencies": {
"bootstrap": "^4.5.3", "bootstrap": "^4.6.0",
"jquery": "^3.5.0", "jquery": "^3.6.0",
"js-yaml": "4.0.0", "js-yaml": "4.0.0",
"popper.js": "^1.16.1" "popper.js": "^1.16.1"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.12.10", "@babel/core": "^7.13.8",
"@babel/preset-env": "^7.12.11", "@babel/preset-env": "^7.13.9",
"autoprefixer": "^9.8.6", "autoprefixer": "^9.8.6",
"braces": "^3.0.2", "braces": "^3.0.2",
"browser-sync": "^2.26.13", "browser-sync": "^2.26.14",
"child_process": "^1.0.2", "child_process": "^1.0.2",
"core-js": "^3.8.2", "core-js": "^3.9.1",
"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",
@@ -33,7 +33,7 @@
"gulp-sourcemaps": "^3.0.0", "gulp-sourcemaps": "^3.0.0",
"gulp-terser": "^2.0.1", "gulp-terser": "^2.0.1",
"localtunnel": "^2.0.1", "localtunnel": "^2.0.1",
"lodash": "^4.17.20", "lodash": "^4.17.21",
"lodash.template": "^4.5.0", "lodash.template": "^4.5.0",
"micromatch": "^4.0.2", "micromatch": "^4.0.2",
"mixin-deep": "^2.0.1", "mixin-deep": "^2.0.1",
yarn.lock
+738 -778
View File
File diff suppressed because it is too large Load Diff