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:
authorAchilleas Pipinellis <axil@gitlab.com>2019-07-12 13:37:44 +0300
committerAchilleas Pipinellis <axil@gitlab.com>2019-07-12 13:37:44 +0300
commit09947dbfa5ed5e597233b97aee9b34621c28e1f7 (patch)
tree1bc6355f0e89978398ab8250553aec469a708234
parentc4d52170e04cef9594fd190c69056f190da0f571 (diff)
Upgrade nanoc
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock19
-rw-r--r--layouts/redirect.html2
3 files changed, 10 insertions, 12 deletions
diff --git a/Gemfile b/Gemfile
index 61ed5154..0798b494 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,6 @@ source 'https://rubygems.org'
gem 'nanoc', '~> 4.10'
gem 'adsf', '~> 1.4'
gem 'adsf-live', '~> 1.4'
-gem 'cri', '2.15.7'
gem 'sassc', '~> 2.0'
gem 'rouge', '~> 3.2'
gem 'rake', '~> 12.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8c334eeb..57017a19 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -16,7 +16,7 @@ GEM
coderay (1.1.2)
colored (1.2)
concurrent-ruby (1.1.5)
- cri (2.15.7)
+ cri (2.15.9)
ddmemoize (1.0.0)
ddmetrics (~> 1.0)
ref (~> 2.0)
@@ -26,7 +26,7 @@ GEM
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
- equatable (0.6.0)
+ equatable (0.6.1)
eventmachine (1.2.7)
ffi (1.11.1)
formatador (0.2.5)
@@ -67,18 +67,18 @@ GEM
mixlib-cli (1.7.0)
mixlib-config (2.2.18)
tomlrb
- nanoc (4.11.5)
+ nanoc (4.11.6)
addressable (~> 2.5)
colored (~> 1.2)
cri (~> 2.15)
- nanoc-core (= 4.11.5)
+ nanoc-core (= 4.11.6)
parallel (~> 1.12)
tomlrb (~> 1.2)
tty-command (~> 0.8)
tty-file (~> 0.7)
tty-platform (~> 0.2)
tty-which (~> 0.4)
- nanoc-core (4.11.5)
+ nanoc-core (4.11.6)
ddmemoize (~> 1.0)
ddmetrics (~> 1.0)
ddplugin (~> 1.0)
@@ -103,7 +103,7 @@ GEM
pry-byebug (3.7.0)
byebug (~> 11.0)
pry (~> 0.10)
- public_suffix (3.1.0)
+ public_suffix (3.1.1)
rack (2.0.7)
rack-livereload (0.3.17)
rack
@@ -112,12 +112,12 @@ GEM
rb-inotify (0.10.0)
ffi (~> 1.0)
ref (2.0.0)
- rouge (3.4.1)
+ rouge (3.6.0)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
- rspec-core (3.8.1)
+ rspec-core (3.8.2)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.4)
diff-lcs (>= 1.2.0, < 2.0)
@@ -162,7 +162,7 @@ GEM
tty-screen (0.7.0)
tty-which (0.4.1)
wisper (2.0.0)
- zeitwerk (2.1.6)
+ zeitwerk (2.1.8)
PLATFORMS
ruby
@@ -171,7 +171,6 @@ DEPENDENCIES
adsf (~> 1.4)
adsf-live (~> 1.4)
builder (~> 3.2)
- cri (= 2.15.7)
gitlab_kramdown (~> 0.6.0)
guard-nanoc (~> 2.1)
highline (~> 2.0)
diff --git a/layouts/redirect.html b/layouts/redirect.html
index 18469c7b..3c341596 100644
--- a/layouts/redirect.html
+++ b/layouts/redirect.html
@@ -13,7 +13,7 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css">
<!-- end of docsearch -->
<script async src="<%= @items['/assets/javascripts/docs.*'].path %>"></script>
- <link href='//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,400italic' rel='stylesheet' type='text/css'>
+ <link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,400italic' rel='stylesheet' type='text/css'>
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
</head>
<body>