Skip to content

G
gitlab-ce
Commit b67a802d authored by GitLab Bot's avatar GitLab Bot
Browse files
Options

Automatic merge of gitlab-org/gitlab-ce master

parents 4cca32ed c167cc58
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 118 deletions
Gemfile
View file @ b67a802d
...@@ -139,9 +139,9 @@ gem 'rdoc', '~> 6.0' ...@@ -139,9 +139,9 @@ gem 'rdoc', '~> 6.0'
gem 'org-ruby', '~> 0.9.12' gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0' gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1' gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 1.5.8' gem 'asciidoctor', '~> 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
gem 'asciidoctor-plantuml', '0.0.8' gem 'asciidoctor-plantuml', '0.0.9'
gem 'rouge', '~> 3.1' gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.11' gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0' gem 'bootstrap_form', '~> 4.2.0'
......
Gemfile.lock
View file @ b67a802d
...@@ -66,11 +66,11 @@ GEM ...@@ -66,11 +66,11 @@ GEM
faraday_middleware (~> 0.9) faraday_middleware (~> 0.9)
faraday_middleware-multi_json (~> 0.0) faraday_middleware-multi_json (~> 0.0)
oauth2 (~> 1.0) oauth2 (~> 1.0)
asciidoctor (1.5.8) asciidoctor (2.0.10)
asciidoctor-include-ext (0.3.1) asciidoctor-include-ext (0.3.1)
asciidoctor (>= 1.5.6, < 3.0.0) asciidoctor (>= 1.5.6, < 3.0.0)
asciidoctor-plantuml (0.0.8) asciidoctor-plantuml (0.0.9)
asciidoctor (~> 1.5) asciidoctor (>= 1.5.6, < 3.0.0)
ast (2.4.0) ast (2.4.0)
atomic (1.1.99) atomic (1.1.99)
attr_encrypted (3.1.0) attr_encrypted (3.1.0)
...@@ -1058,9 +1058,9 @@ DEPENDENCIES ...@@ -1058,9 +1058,9 @@ DEPENDENCIES
akismet (~> 2.0) akismet (~> 2.0)
apollo_upload_server (~> 2.0.0.beta3) apollo_upload_server (~> 2.0.0.beta3)
asana (~> 0.8.1) asana (~> 0.8.1)
asciidoctor (~> 1.5.8) asciidoctor (~> 2.0.10)
asciidoctor-include-ext (~> 0.3.1) asciidoctor-include-ext (~> 0.3.1)
asciidoctor-plantuml (= 0.0.8) asciidoctor-plantuml (= 0.0.9)
attr_encrypted (~> 3.1.0) attr_encrypted (~> 3.1.0)
awesome_print awesome_print
aws-sdk aws-sdk
......
app/assets/stylesheets/bootstrap.scss deleted 100644 → 0
View file @ 4cca32ed
/*
* Includes specific styles from the bootstrap4 folder in node_modules
*/
@import "../../../node_modules/bootstrap/scss/functions";
@import "../../../node_modules/bootstrap/scss/variables";
@import "../../../node_modules/bootstrap/scss/mixins";
@import "../../../node_modules/bootstrap/scss/root";
@import "../../../node_modules/bootstrap/scss/reboot";
@import "../../../node_modules/bootstrap/scss/type";
@import "../../../node_modules/bootstrap/scss/images";
@import "../../../node_modules/bootstrap/scss/code";
@import "../../../node_modules/bootstrap/scss/grid";
@import "../../../node_modules/bootstrap/scss/tables";
@import "../../../node_modules/bootstrap/scss/forms";
@import "../../../node_modules/bootstrap/scss/buttons";
@import "../../../node_modules/bootstrap/scss/transitions";
@import "../../../node_modules/bootstrap/scss/dropdown";
@import "../../../node_modules/bootstrap/scss/button-group";
@import "../../../node_modules/bootstrap/scss/input-group";
@import "../../../node_modules/bootstrap/scss/custom-forms";
@import "../../../node_modules/bootstrap/scss/nav";
@import "../../../node_modules/bootstrap/scss/navbar";
@import "../../../node_modules/bootstrap/scss/card";
@import "../../../node_modules/bootstrap/scss/breadcrumb";
@import "../../../node_modules/bootstrap/scss/pagination";
@import "../../../node_modules/bootstrap/scss/badge";
@import "../../../node_modules/bootstrap/scss/alert";
@import "../../../node_modules/bootstrap/scss/progress";
@import "../../../node_modules/bootstrap/scss/media";
@import "../../../node_modules/bootstrap/scss/list-group";
@import "../../../node_modules/bootstrap/scss/close";
@import "../../../node_modules/bootstrap/scss/modal";
@import "../../../node_modules/bootstrap/scss/tooltip";
@import "../../../node_modules/bootstrap/scss/popover";
@import "../../../node_modules/bootstrap/scss/utilities";
@import "../../../node_modules/bootstrap/scss/print";
app/assets/stylesheets/bootstrap_migration.scss
View file @ b67a802d
/*
* Scss to help with bootstrap 3 to 4 migration
*/
$text-color: $gl-text-color; $text-color: $gl-text-color;
$brand-primary: $blue-500; $brand-primary: $blue-500;
...@@ -18,6 +14,9 @@ $input-border: $border-color; ...@@ -18,6 +14,9 @@ $input-border: $border-color;
$padding-base-vertical: $gl-vert-padding; $padding-base-vertical: $gl-vert-padding;
$padding-base-horizontal: $gl-padding; $padding-base-horizontal: $gl-padding;
/*
* Scss to help with bootstrap 3 to 4 migration
*/
body, body,
.form-control, .form-control,
.search form { .search form {
......
app/assets/stylesheets/framework.scss
View file @ b67a802d
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
@import 'framework/variables_overrides'; @import 'framework/variables_overrides';
@import 'framework/mixins'; @import 'framework/mixins';
@import 'bootstrap'; @import '../../../node_modules/@gitlab/ui/scss/gitlab_ui';
@import 'bootstrap_migration'; @import 'bootstrap_migration';
@import 'framework/layout'; @import 'framework/layout';
......
changelogs/unreleased/asciidoctor-upgrade.yml 0 → 100644
View file @ b67a802d
---
title: Upgrade asciidoctor version to 2.0.10
merge_request: 29741
author: Rajendra Kadam
type: added
config/application.rb
View file @ b67a802d
...@@ -166,6 +166,7 @@ module Gitlab ...@@ -166,6 +166,7 @@ module Gitlab
# Import gitlab-svgs directly from vendored directory # Import gitlab-svgs directly from vendored directory
config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist" config.assets.paths << "#{config.root}/node_modules/@gitlab/svgs/dist"
config.assets.paths << "#{config.root}/node_modules"
config.assets.precompile << "icons.svg" config.assets.precompile << "icons.svg"
config.assets.precompile << "icons.json" config.assets.precompile << "icons.json"
config.assets.precompile << "illustrations/*.svg" config.assets.precompile << "illustrations/*.svg"
......
lib/gitlab/asciidoc/html5_converter.rb
View file @ b67a802d
# frozen_string_literal: true # frozen_string_literal: true
require 'asciidoctor' require 'asciidoctor'
require 'asciidoctor/converter/html5'
module Gitlab module Gitlab
module Asciidoc module Asciidoc
class Html5Converter < Asciidoctor::Converter::Html5Converter class Html5Converter < (Asciidoctor::Converter.for 'html5')
extend Asciidoctor::Converter::Config
register_for 'gitlab_html5' register_for 'gitlab_html5'
def stem(node) def convert_stem(node)
return super unless node.style.to_sym == :latexmath return super unless node.style.to_sym == :latexmath
%(<pre#{id_attribute(node)} data-math-style="display"><code>#{node.content}</code></pre>) %(<pre#{id_attribute(node)} data-math-style="display"><code>#{node.content}</code></pre>)
end end
def inline_quoted(node) def convert_inline_quoted(node)
return super unless node.type.to_sym == :latexmath return super unless node.type.to_sym == :latexmath
%(<code#{id_attribute(node)} data-math-style="inline">#{node.text}</code>) %(<code#{id_attribute(node)} data-math-style="inline">#{node.text}</code>)
......
qa/Rakefile
View file @ b67a802d
...@@ -13,8 +13,9 @@ task :delete_subgroups do ...@@ -13,8 +13,9 @@ task :delete_subgroups do
end end
desc "Generate Performance Testdata" desc "Generate Performance Testdata"
task :generate_perf_testdata do task :generate_perf_testdata, :type do |t, args|
QA::Tools::GeneratePerfTestdata.new.run args.with_defaults(type: :all)
QA::Tools::GeneratePerfTestdata.new.method(args[:type]).call
end end
desc "Run artillery load tests" desc "Run artillery load tests"
......
qa/qa/tools/generate_perf_testdata.rb
View file @ b67a802d
This diff is collapsed.
yarn.lock
View file @ b67a802d
...@@ -705,13 +705,14 @@ ...@@ -705,13 +705,14 @@
resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.65.0.tgz#48a3a64c0b5524de4e57d51b82a71274af17744d" resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.65.0.tgz#48a3a64c0b5524de4e57d51b82a71274af17744d"
integrity sha512-GC9JgVu4/2Ysc3hKFmX6TQV6tqvHZDcfd/DzBzYjy3rHO9qYMZFnw/CKCGa8LkU9F79vfDo3G8NSja7FDXMccw== integrity sha512-GC9JgVu4/2Ysc3hKFmX6TQV6tqvHZDcfd/DzBzYjy3rHO9qYMZFnw/CKCGa8LkU9F79vfDo3G8NSja7FDXMccw==
"@gitlab/ui@^4.1.0": "@gitlab/ui@^4.2.0":
version "4.1.0" version "4.2.0"
resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-4.1.0.tgz#bc80ba7846862a336b9f285c42c3fd0f29147c82" resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-4.2.0.tgz#e7fc32b279eaaaf9f0560e431c1af5e467a0ce4c"
integrity sha512-YVIOVtKSjuhQX3ZWA1DBT75Q9rMPvpJIVko5X3yzfRSc9KsPSgVRiOKieDtAviO7LLaeTxMZNzT4J3oY7ejGCw== integrity sha512-tOyjjgEECwgVADMtxVetMzn6oRkD0knw7lhDgqP/lIfUTiPuJkVveyhE9z+lqIOvbUs4i65I4q1x84cpDODcYA==
dependencies: dependencies:
"@babel/standalone" "^7.0.0" "@babel/standalone" "^7.0.0"
"@gitlab/vue-toasted" "^1.2.1" "@gitlab/vue-toasted" "^1.2.1"
bootstrap "4.3.1"
bootstrap-vue "^2.0.0-rc.11" bootstrap-vue "^2.0.0-rc.11"
copy-to-clipboard "^3.0.8" copy-to-clipboard "^3.0.8"
echarts "^4.2.0-rc.2" echarts "^4.2.0-rc.2"
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7