Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-04
Showing
... | @@ -142,7 +142,7 @@ gem 'aws-sdk' | ... | @@ -142,7 +142,7 @@ gem 'aws-sdk' |
gem 'faraday_middleware-aws-signers-v4' | gem 'faraday_middleware-aws-signers-v4' | ||
# Markdown and HTML processing | # Markdown and HTML processing | ||
gem 'html-pipeline', '~> 2.7.1' | gem 'html-pipeline', '~> 2.8' | ||
gem 'deckar01-task_list', '2.0.0' | gem 'deckar01-task_list', '2.0.0' | ||
gem 'gitlab-markup', '~> 1.6.4' | gem 'gitlab-markup', '~> 1.6.4' | ||
gem 'redcarpet', '~> 3.4' | gem 'redcarpet', '~> 3.4' | ||
... | ... |
Please register or sign in to comment