Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-docs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2022-06-13 06:02:47 +0300
committerEvan Read <eread@gitlab.com>2022-06-15 05:11:56 +0300
commit456ba86569d2c7a7036629c35e47b62593a0a731 (patch)
tree38cd7156a97d140f7e5ea4f0587a9e80b5724174
parent5c949ea4e44abbbd251a84e160d30f748b028b52 (diff)
Update Ruby gemseread/update-ruby-gems
- Use newer Docker images - Fix call that was broken by update to Psych library
-rw-r--r--.gitlab-ci.yml10
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock56
-rw-r--r--Rakefile2
4 files changed, 37 insertions, 33 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e83e21c..03eaba95 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ include:
- '/ci/danger-review.yml'
default:
- image: registry.gitlab.com/gitlab-org/gitlab-docs:base
+ image: registry.gitlab.com/gitlab-org/gitlab-docs/base:alpine-3.16-ruby-2.7.6-0bc327a4
tags:
- gitlab-org
# Check Ruby, RubyGems, and Bundler versions and install gems
@@ -185,7 +185,7 @@ workflow:
###############################################
.build_base:
- image: registry.gitlab.com/gitlab-org/gitlab-docs:bootstrap
+ image: registry.gitlab.com/gitlab-org/gitlab-docs/base:alpine-3.16-ruby-2.7.6-0bc327a4
stage: build
extends:
- .cache_gem_yarn
@@ -240,7 +240,7 @@ compile_dev:
# Test internal links and anchors with nanoc
#
test_internal_links_and_anchors:
- image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.15-ruby-2.7.5-cee62c13
+ image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.16-ruby-2.7.6-0bc327a4
extends:
- .rules_site_tests
- .cache_gem
@@ -385,7 +385,7 @@ test_EOL_whitespace:
- .rules_chores
- .cache_gem
stage: test
- image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.15-ruby-2.7.5-cee62c13
+ image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.16-ruby-2.7.6-0bc327a4
needs: []
before_script: []
dependencies: []
@@ -402,7 +402,7 @@ test_unlinked_images:
- .rules_chores
- .cache_gem
stage: test
- image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.15-ruby-2.7.5-cee62c13
+ image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.16-ruby-2.7.6-0bc327a4
needs: []
before_script: []
dependencies: []
diff --git a/Gemfile b/Gemfile
index 627d07b7..d1f790fa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ group :nanoc do
gem 'nanoc-live'
# custom kramdown dialect
- gem 'gitlab_kramdown', '~> 0.19.0'
+ gem 'gitlab_kramdown', '~> 0.20.0'
# Needed to generate Sitemap
gem 'builder', '~> 3.2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7e66e8ad..6ca72247 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,8 +17,8 @@ GEM
listen (~> 3.0)
rack-livereload (~> 0.3)
asciidoctor (2.0.17)
- asciidoctor-plantuml (0.0.15)
- asciidoctor (>= 1.5.6, < 3.0.0)
+ asciidoctor-plantuml (0.0.16)
+ asciidoctor (>= 2.0.17, < 3.0.0)
ast (2.4.2)
builder (3.2.4)
byebug (11.1.3)
@@ -72,11 +72,11 @@ GEM
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
- faraday-http-cache (2.2.0)
+ faraday-http-cache (2.4.0)
faraday (>= 0.8)
faraday-httpclient (1.0.1)
- faraday-multipart (1.0.3)
- multipart-post (>= 1.2, < 3)
+ faraday-multipart (1.0.4)
+ multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
@@ -99,11 +99,11 @@ GEM
rubocop-performance (~> 1.9.2)
rubocop-rails (~> 2.9)
rubocop-rspec (~> 1.44)
- gitlab_kramdown (0.19.0)
- asciidoctor-plantuml (= 0.0.15)
- kramdown (~> 2.3.0)
+ gitlab_kramdown (0.20.0)
+ asciidoctor-plantuml (= 0.0.16)
+ kramdown (~> 2.4.0)
nokogiri (~> 1.13.0)
- rouge (~> 3.28.0)
+ rouge (~> 3.29.0)
hamster (3.0.0)
concurrent-ruby (~> 1.0)
highline (2.0.3)
@@ -114,7 +114,7 @@ GEM
i18n (1.10.0)
concurrent-ruby (~> 1.0)
json_schema (0.21.0)
- kramdown (2.3.2)
+ kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
@@ -129,13 +129,13 @@ GEM
mini_portile2 (2.8.0)
minitest (5.15.0)
multi_xml (0.6.0)
- multipart-post (2.1.1)
- nanoc (4.12.5)
+ multipart-post (2.2.3)
+ nanoc (4.12.7)
addressable (~> 2.5)
colored (~> 1.2)
nanoc-checking (~> 1.0, >= 1.0.2)
- nanoc-cli (= 4.12.5)
- nanoc-core (= 4.12.5)
+ nanoc-cli (= 4.12.7)
+ nanoc-core (= 4.12.7)
nanoc-deploying (~> 1.0)
parallel (~> 1.12)
tty-command (~> 0.8)
@@ -143,22 +143,23 @@ GEM
nanoc-checking (1.0.2)
nanoc-cli (~> 4.12, >= 4.12.4)
nanoc-core (~> 4.12, >= 4.12.4)
- nanoc-cli (4.12.5)
+ nanoc-cli (4.12.7)
cri (~> 2.15)
diff-lcs (~> 1.3)
- nanoc-core (= 4.12.5)
+ nanoc-core (= 4.12.7)
zeitwerk (~> 2.1)
- nanoc-core (4.12.5)
+ nanoc-core (4.12.7)
concurrent-ruby (~> 1.1)
ddmetrics (~> 1.0)
ddplugin (~> 1.0)
hamster (~> 3.0)
json_schema (~> 0.19)
memo_wise (~> 1.5)
+ psych (~> 4.0)
slow_enumerator_tools (~> 1.0)
tty-platform (~> 0.2)
zeitwerk (~> 2.1)
- nanoc-deploying (1.0.1)
+ nanoc-deploying (1.0.2)
nanoc-checking (~> 1.0)
nanoc-cli (~> 4.11, >= 4.11.15)
nanoc-core (~> 4.11, >= 4.11.15)
@@ -169,12 +170,12 @@ GEM
nanoc-core (~> 4.11, >= 4.11.14)
nap (1.1.0)
no_proxy_fix (0.1.2)
- nokogiri (1.13.5)
+ nokogiri (1.13.6)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
- octokit (4.22.0)
- faraday (>= 0.9)
- sawyer (~> 0.8.0, >= 0.5.3)
+ octokit (4.24.0)
+ faraday (>= 1, < 3)
+ sawyer (~> 0.9)
open4 (1.3.4)
parallel (1.22.1)
parser (3.1.2.0)
@@ -187,6 +188,8 @@ GEM
pry-byebug (3.9.0)
byebug (~> 11.0)
pry (~> 0.13.0)
+ psych (4.0.4)
+ stringio
public_suffix (4.0.7)
racc (1.6.0)
rack (2.2.3.1)
@@ -200,7 +203,7 @@ GEM
rchardet (1.8.0)
regexp_parser (2.5.0)
rexml (3.2.5)
- rouge (3.28.0)
+ rouge (3.29.0)
rspec (3.11.0)
rspec-core (~> 3.11.0)
rspec-expectations (~> 3.11.0)
@@ -248,10 +251,11 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7)
sassc (2.4.0)
ffi (~> 1.9)
- sawyer (0.8.2)
+ sawyer (0.9.2)
addressable (>= 2.3.5)
- faraday (> 0.8, < 2.0)
+ faraday (>= 0.17.3, < 3)
slow_enumerator_tools (1.1.0)
+ stringio (3.0.2)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
tty-color (0.6.0)
@@ -271,7 +275,7 @@ DEPENDENCIES
builder (~> 3.2.0)
gitlab-dangerfiles (~> 3.1.0)
gitlab-styles (~> 7.1.0)
- gitlab_kramdown (~> 0.19.0)
+ gitlab_kramdown (~> 0.20.0)
highline (~> 2.0.0)
nanoc (~> 4.12.0)
nanoc-live
diff --git a/Rakefile b/Rakefile
index d005b152..bc662c63 100644
--- a/Rakefile
+++ b/Rakefile
@@ -201,7 +201,7 @@ end
desc 'Create the _redirects file'
task :redirects do
- redirects_yaml = YAML.load_file('content/_data/redirects.yaml')
+ redirects_yaml = YAML.load_file('content/_data/redirects.yaml', permitted_classes: [Date])
redirects_file = 'public/_redirects'
# Remove _redirects before populating it