Merge branch 'master' into 8-10-stable
Showing
... | ... | @@ -61,7 +61,7 @@ gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: 'omniauth-ldap' |
# Git Wiki | ||
# Required manually in config/initializers/gollum.rb to control load order | ||
gem 'gollum-lib', '~> 4.1.0', require: false | ||
gem 'gollum-lib', '~> 4.2', require: false | ||
gem 'gollum-rugged_adapter', '~> 0.4.2', require: false | ||
# Language detection | ||
... | ... | @@ -105,7 +105,7 @@ gem 'seed-fu', '~> 2.3.5' |
# Markdown and HTML processing | ||
gem 'html-pipeline', '~> 1.11.0' | ||
gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' | ||
gem 'github-markup', '~> 1.3.1' | ||
gem 'github-markup', '~> 1.4' | ||
gem 'redcarpet', '~> 3.3.3' | ||
gem 'RedCloth', '~> 4.3.2' | ||
gem 'rdoc', '~>3.6' | ||
... | ... | @@ -113,7 +113,7 @@ gem 'org-ruby', '~> 0.9.12' |
gem 'creole', '~> 0.5.0' | ||
gem 'wikicloth', '0.8.1' | ||
gem 'asciidoctor', '~> 1.5.2' | ||
gem 'rouge', '~> 1.11' | ||
gem 'rouge', '~> 2.0' | ||
# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s | ||
# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM | ||
... | ... |
app/helpers/u2f_helper.rb
0 → 100644
Please register or sign in to comment