Commit 5dfb8190 authored by Emmanuele Bassi's avatar Emmanuele Bassi 👣
Browse files

Revert "Merge branch 'master' into 'master'"

This reverts merge request !120
parent d1f67b99
Pipeline #276714 failed with stage
in 12 minutes and 14 seconds
image: ruby:2.7
image: ruby:2.5
variables:
JEKYLL_ENV: production
......
......@@ -4,17 +4,17 @@ GEM
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
colorator (1.1.0)
concurrent-ruby (1.1.8)
em-websocket (0.5.2)
concurrent-ruby (1.1.7)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
eventmachine (1.2.7-x64-mingw32)
ffi (1.15.0)
ffi (1.15.0-x64-mingw32)
ffi (1.13.1)
ffi (1.13.1-x64-mingw32)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
i18n (1.8.10)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
jekyll (4.0.1)
addressable (~> 2.4)
......@@ -31,7 +31,7 @@ GEM
rouge (~> 3.0)
safe_yaml (~> 1.0)
terminal-table (~> 1.8)
jekyll-feed (0.15.1)
jekyll-feed (0.15.0)
jekyll (>= 3.7, < 5.0)
jekyll-sass-converter (2.1.0)
sassc (> 2.0.1, < 3.0)
......@@ -39,12 +39,12 @@ GEM
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.3.1)
kramdown (2.3.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.5.1)
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
......@@ -54,8 +54,8 @@ GEM
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.5)
rouge (3.26.0)
rexml (3.2.4)
rouge (3.22.0)
safe_yaml (1.0.5)
sassc (2.4.0)
ffi (~> 1.9)
......@@ -63,9 +63,9 @@ GEM
ffi (~> 1.9)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
tzinfo (2.0.4)
tzinfo (2.0.2)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2021.1)
tzinfo-data (1.2020.1)
tzinfo (>= 1.0.0)
unicode-display_width (1.7.0)
......
......@@ -104,14 +104,13 @@ list of dependencies used by this project:
| Package | Version | File | Source |
| ----------------------------- | -------- | ---------------------------- | ----------------------------------------------------- |
| bootstrap | `4.6.2` | [package.json][package.json] | [Github](https://github.com/twbs/bootstrap) |
| @fortawesome/fontawesome-free | `5.15.3` | [package.json][package.json] | [Github](https://github.com/FortAwesome/Font-Awesome) |
| jquery | `3.6.0` | [package.json][package.json] | [Github](https://github.com/jquery/jquery) |
| bootstrap | `4.5.2` | [package.json][package.json] | [Github](https://github.com/twbs/bootstrap) |
| @fortawesome/fontawesome-free | `5.14.0` | [package.json][package.json] | [Github](https://github.com/FortAwesome/Font-Awesome) |
| jquery | `3.5.1` | [package.json][package.json] | [Github](https://github.com/jquery/jquery) |
| popper.js | `1.16.1` | [package.json][package.json] | [Github](https://github.com/FezVrasta/popper.js/) |
| slick-carousel | `1.8.1` | [package.json][package.json] | [Github](https://github.com/kenwheeler/slick/) |
| moment | `2.29.1` | [package.json][package.json] | [Github](https://github.com/moment/moment/) |
| node-sass | `5.0.0` | [package.json][package.json] | [Github](https://github.com/sass/node-sass/) |
| html-minfier | `4.0.0` | [package.json][package.json] | [Github](https://github.com/kangax/html-minifier) |
| moment | `2.27.0` | [package.json][package.json] | [Github](https://github.com/moment/moment/) |
| node-sass | `4.14.1` | [package.json][package.json] | [Github](https://github.com/sass/node-sass/) |
| jekyll | `4.0.1` | [Gemfile][gemfile] | [Github](https://github.com/jekyll/jekyll/) |
Read about adding/updating/removing dependencies on [how to contribute](CONTRIBUTING.MD#addingupdatingremoving-dependencies).
......@@ -137,7 +136,7 @@ You can reach out to the following individuals if you have any doubt or suggesti
**Ravgeet Dhillon**
- You can contact me via my [email](mailto:ravgeetdhillon@gmail.com) or through my [website](https://ravgeetdev.netlify.app).
- You can contact me via my [email](mailto:ravgeetdhillon@gmail.com) or through my [website](https://ravgeetdhillon.github.io).
- You can also find me on IRC. I am `ravgeetdhillon` on `irc.gnome.org` in the `#gtk` or
`#gnome-hackers` channels.
......
......@@ -1449,9 +1449,9 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
},
"y18n": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
"integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
},
"yallist": {
"version": "2.1.2",
......
{
"name": "gtk-web",
"version": "1.0.0",
"description": "The dependencies for the official website of GTK. Visit https://gtk.org/",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"watch-sass": "node-sass -w assets/scss/ -o assets/css/ --output-style compressed",
"compile-sass": "node-sass assets/scss/ -o assets/css/ --output-style compressed",
"minify-html": "run(){ html-minifier --collapse-whitespace --remove-comments --remove-tag-whitespace $1 -o $1; }; run"
},
"repository": {
"type": "git",
"url": "git+https://gitlab.gnome.org/Infrastructure/gtk-web.git"
},
"bugs": {
"url": "https://gitlab.gnome.org/Infrastructure/gtk-web/issues"
},
"homepage": "https://gitlab.gnome.org/Infrastructure/gtk-web#readme",
"keywords": [
"gtk",
"gimp",
"gnome",
"toolkit",
"user interface"
],
"author": "GNOME",
"license": "ISC",
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.3",
"bootstrap": "^4.6.0",
"html-minifier": "^4.0.0",
"jquery": "^3.6.0",
"moment": "^2.29.1",
"node-sass": "^5.0.0",
"popper.js": "^1.16.1",
"slick-carousel": "^1.8.1"
}
}
"name": "gtk-web",
"version": "1.0.0",
"description": "The dependencies for the official website of GTK. Visit https://gtk.org/",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"watch-sass": "node-sass -w assets/scss/ -o assets/css/ --output-style compressed",
"compile-sass": "node-sass assets/scss/ -o assets/css/ --output-style compressed",
"minify-html": "run(){ html-minifier --collapse-whitespace --remove-comments --remove-tag-whitespace $1 -o $1; }; run"
},
"repository": {
"type": "git",
"url": "git+https://gitlab.gnome.org/Infrastructure/gtk-web.git"
},
"bugs": {
"url": "https://gitlab.gnome.org/Infrastructure/gtk-web/issues"
},
"homepage": "https://gitlab.gnome.org/Infrastructure/gtk-web#readme",
"keywords": [
"gtk",
"gimp",
"gnome",
"toolkit",
"user interface"
],
"author": "GNOME",
"license": "ISC",
"dependencies": {
"@fortawesome/fontawesome-free": "^5.14.0",
"bootstrap": "^4.5.2",
"html-minifier": "^4.0.0",
"jquery": "^3.5.1",
"moment": "^2.27.0",
"node-sass": "^4.14.1",
"popper.js": "^1.16.1",
"slick-carousel": "^1.8.1"
}
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment