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:
authorMarcel Amirault <mamirault@gitlab.com>2020-12-14 03:53:48 +0300
committerMarcel Amirault <mamirault@gitlab.com>2020-12-14 03:53:48 +0300
commit966f693349984e728f3df8971a7766c77ab5c361 (patch)
tree8c4e8b6425aeee5663763d5a13a6d33bc03b68be
parentc928f8d33af1935cc1ee178c127dde52e852fb50 (diff)
parent41b4d598ea23752e9a531f3d0b0f55a447f91494 (diff)
Merge branch 'renovate/ruby-dependencies' into 'master'
Update Ruby dependencies See merge request gitlab-org/gitlab-docs!1396
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock29
2 files changed, 16 insertions, 17 deletions
diff --git a/Gemfile b/Gemfile
index fcd0f53a..ea78ad19 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gem 'nanoc', '~> 4.11.0'
gem 'adsf', '~> 1.4.3'
gem 'adsf-live', '~> 1.4.3'
gem 'sassc', '~> 2.4.0'
-gem 'rouge', '~> 3.25.0'
+gem 'rouge', '~> 3.26.0'
gem 'rake', '~> 13.0.1'
group :nanoc do
@@ -25,5 +25,5 @@ group :test, :development do
gem 'highline', '~> 2.0.3'
gem 'rspec', '~> 3.10.0'
gem 'pry-byebug', '~> 3.9.0', require: false
- gem 'gitlab-styles', '~> 5.1.0', require: false
+ gem 'gitlab-styles', '~> 5.3.0', require: false
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 18c1e8ae..b54e443c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (6.0.3.4)
+ activesupport (6.1.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
- i18n (>= 0.7, < 2)
- minitest (~> 5.1)
- tzinfo (~> 1.1)
- zeitwerk (~> 2.2, >= 2.2.2)
+ i18n (>= 1.6, < 2)
+ minitest (>= 5.1)
+ tzinfo (~> 2.0)
+ zeitwerk (~> 2.3)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
adsf (1.4.3)
@@ -39,7 +39,7 @@ GEM
eventmachine (1.2.7)
ffi (1.13.1)
formatador (0.2.5)
- gitlab-styles (5.1.0)
+ gitlab-styles (5.3.0)
rubocop (~> 0.89.1)
rubocop-gitlab-security (~> 0.1.0)
rubocop-performance (~> 1.8.1)
@@ -120,7 +120,7 @@ GEM
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
- parallel (1.20.0)
+ parallel (1.20.1)
parser (2.7.2.0)
ast (~> 2.4.1)
pastel (0.8.0)
@@ -141,9 +141,9 @@ GEM
rb-inotify (0.10.1)
ffi (~> 1.0)
ref (2.0.0)
- regexp_parser (1.8.2)
+ regexp_parser (2.0.0)
rexml (3.2.4)
- rouge (3.25.0)
+ rouge (3.26.0)
rspec (3.10.0)
rspec-core (~> 3.10.0)
rspec-expectations (~> 3.10.0)
@@ -193,17 +193,16 @@ GEM
shellany (0.0.1)
slow_enumerator_tools (1.1.0)
thor (1.0.1)
- thread_safe (0.3.6)
tomlrb (1.3.0)
tty-color (0.5.2)
tty-command (0.10.0)
pastel (~> 0.8)
tty-platform (0.3.0)
tty-which (0.4.2)
- tzinfo (1.2.8)
- thread_safe (~> 0.1)
+ tzinfo (2.0.3)
+ concurrent-ruby (~> 1.0)
unicode-display_width (1.7.0)
- zeitwerk (2.4.1)
+ zeitwerk (2.4.2)
PLATFORMS
ruby
@@ -212,7 +211,7 @@ DEPENDENCIES
adsf (~> 1.4.3)
adsf-live (~> 1.4.3)
builder (~> 3.2.4)
- gitlab-styles (~> 5.1.0)
+ gitlab-styles (~> 5.3.0)
gitlab_kramdown (~> 0.10.0)
guard-nanoc
highline (~> 2.0.3)
@@ -220,7 +219,7 @@ DEPENDENCIES
nokogiri (~> 1.10.10)
pry-byebug (~> 3.9.0)
rake (~> 13.0.1)
- rouge (~> 3.25.0)
+ rouge (~> 3.26.0)
rspec (~> 3.10.0)
sassc (~> 2.4.0)
scss_lint (~> 0.59.0)