diff options
author | Sarah German <sgerman@gitlab.com> | 2022-11-30 20:46:44 +0300 |
---|---|---|
committer | Sarah German <sgerman@gitlab.com> | 2022-11-30 20:46:44 +0300 |
commit | 1092d9b0c854c62308ad74241096c7f5d50ce846 (patch) | |
tree | cdc6eac9378ffe7065221b4e37088f927affd3d5 | |
parent | 8dd5daae0bcbe341360d27e01c57ba6611104d68 (diff) | |
parent | 5fdf11bdd42a7a51eb5d48790ab29afb3d5ff0bc (diff) |
Merge branch 'sh-update-nanoc' into 'main'
Update nanoc to fix compile crashes
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3323
Merged-by: Sarah German <sgerman@gitlab.com>
Approved-by: Sarah German <sgerman@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 14 |
2 files changed, 8 insertions, 8 deletions
@@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'nanoc', '~> 4.12.12' +gem 'nanoc', '~> 4.12.13' gem 'sassc', '~> 2.4.0' gem 'rake', '~> 13.0.6' diff --git a/Gemfile.lock b/Gemfile.lock index 1367cccb..68733107 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -134,12 +134,12 @@ GEM minitest (5.16.3) multi_xml (0.6.0) multipart-post (2.2.3) - nanoc (4.12.12) + nanoc (4.12.13) addressable (~> 2.5) colored (~> 1.2) nanoc-checking (~> 1.0, >= 1.0.2) - nanoc-cli (= 4.12.12) - nanoc-core (= 4.12.12) + nanoc-cli (= 4.12.13) + nanoc-core (= 4.12.13) nanoc-deploying (~> 1.0) parallel (~> 1.12) tty-command (~> 0.8) @@ -147,12 +147,12 @@ GEM nanoc-checking (1.0.2) nanoc-cli (~> 4.12, >= 4.12.4) nanoc-core (~> 4.12, >= 4.12.4) - nanoc-cli (4.12.12) + nanoc-cli (4.12.13) cri (~> 2.15) diff-lcs (~> 1.3) - nanoc-core (= 4.12.12) + nanoc-core (= 4.12.13) zeitwerk (~> 2.1) - nanoc-core (4.12.12) + nanoc-core (4.12.13) concurrent-ruby (~> 1.1) ddmetrics (~> 1.0) ddplugin (~> 1.0) @@ -303,7 +303,7 @@ DEPENDENCIES gitlab-styles (~> 9.1.0) gitlab_kramdown (~> 0.22.0) highline (~> 2.0.3) - nanoc (~> 4.12.12) + nanoc (~> 4.12.13) nanoc-live pry-byebug (~> 3.10.1) rake (~> 13.0.6) |