Merge branch 'master' into fix/keep-artifacts-button-visibility
* master: (579 commits) Conflicts: spec/models/build_spec.rb
Showing
This diff is collapsed.
... | @@ -101,7 +101,7 @@ gem 'seed-fu', '~> 2.3.5' | ... | @@ -101,7 +101,7 @@ gem 'seed-fu', '~> 2.3.5' |
# Markdown and HTML processing | # Markdown and HTML processing | ||
gem 'html-pipeline', '~> 1.11.0' | gem 'html-pipeline', '~> 1.11.0' | ||
gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie' | gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie' | ||
gem 'gitlab-markup', '~> 1.5.0' | gem 'gitlab-markup', '~> 1.5.1' | ||
gem 'redcarpet', '~> 3.3.3' | gem 'redcarpet', '~> 3.3.3' | ||
gem 'RedCloth', '~> 4.3.2' | gem 'RedCloth', '~> 4.3.2' | ||
gem 'rdoc', '~> 4.2' | gem 'rdoc', '~> 4.2' | ||
... | @@ -109,6 +109,7 @@ gem 'org-ruby', '~> 0.9.12' | ... | @@ -109,6 +109,7 @@ 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.2' | gem 'asciidoctor', '~> 1.5.2' | ||
gem 'asciidoctor-plantuml', '0.0.6' | |||
gem 'rouge', '~> 2.0' | gem 'rouge', '~> 2.0' | ||
gem 'truncato', '~> 0.7.8' | gem 'truncato', '~> 0.7.8' | ||
... | @@ -221,8 +222,7 @@ gem 'chronic_duration', '~> 0.10.6' | ... | @@ -221,8 +222,7 @@ gem 'chronic_duration', '~> 0.10.6' |
gem 'sass-rails', '~> 5.0.6' | gem 'sass-rails', '~> 5.0.6' | ||
gem 'coffee-rails', '~> 4.1.0' | gem 'coffee-rails', '~> 4.1.0' | ||
gem 'uglifier', '~> 2.7.2' | gem 'uglifier', '~> 2.7.2' | ||
gem 'turbolinks', '~> 2.5.0' | gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6' | ||
gem 'jquery-turbolinks', '~> 2.1.0' | |||
gem 'addressable', '~> 2.3.8' | gem 'addressable', '~> 2.3.8' | ||
gem 'bootstrap-sass', '~> 3.3.0' | gem 'bootstrap-sass', '~> 3.3.0' | ||
... | @@ -300,8 +300,8 @@ group :development, :test do | ... | @@ -300,8 +300,8 @@ group :development, :test do |
gem 'spring-commands-spinach', '~> 1.1.0' | gem 'spring-commands-spinach', '~> 1.1.0' | ||
gem 'spring-commands-teaspoon', '~> 0.0.2' | gem 'spring-commands-teaspoon', '~> 0.0.2' | ||
gem 'rubocop', '~> 0.43.0', require: false | gem 'rubocop', '~> 0.46.0', require: false | ||
gem 'rubocop-rspec', '~> 1.5.0', require: false | gem 'rubocop-rspec', '~> 1.9.1', require: false | ||
gem 'scss_lint', '~> 0.47.0', require: false | gem 'scss_lint', '~> 0.47.0', require: false | ||
gem 'haml_lint', '~> 0.18.2', require: false | gem 'haml_lint', '~> 0.18.2', require: false | ||
gem 'simplecov', '0.12.0', require: false | gem 'simplecov', '0.12.0', require: false | ||
... | ... |
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/update/8.15-to-8.16.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
spec/support/stub_env.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment