diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-21 12:06:40 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-21 12:06:40 +0000 |
| commit | 0a6ffb540e569bd7a7c548d59b12bc55d4bf9cf1 (patch) | |
| tree | 9ff7dd7b21a3f9642a8fbb45c922f71a433faf02 /Gemfile | |
| parent | a048261403ea7e12992ccffe704f0779235712d7 (diff) | |
| download | gitlab-ce-0a6ffb540e569bd7a7c548d59b12bc55d4bf9cf1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -101,7 +101,7 @@ gem 'hashie-forbidden_attributes' gem 'kaminari', '~> 1.0' # HAML -gem 'hamlit', '~> 2.8.8' +gem 'hamlit', '~> 2.10.0' # Files attachments gem 'carrierwave', '~> 1.3' @@ -135,7 +135,7 @@ gem 'aws-sdk' gem 'faraday_middleware-aws-signers-v4' # Markdown and HTML processing -gem 'html-pipeline', '~> 2.8' +gem 'html-pipeline', '~> 2.12' gem 'deckar01-task_list', '2.2.1' gem 'gitlab-markup', '~> 1.7.0' gem 'github-markup', '~> 1.7.0', require: 'github/markup' @@ -373,7 +373,7 @@ group :development, :test do gem 'rubocop-rspec', '~> 1.22.1' gem 'scss_lint', '~> 0.56.0', require: false - gem 'haml_lint', '~> 0.31.0', require: false + gem 'haml_lint', '~> 0.34.0', require: false gem 'simplecov', '~> 0.16.1', require: false gem 'bundler-audit', '~> 0.5.0', require: false |