diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2018-11-10 12:59:29 -0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2018-11-11 18:58:17 -0300 |
| commit | 1e1f99f2b1b3d79f4b767362fbf8fe1838348175 (patch) | |
| tree | f9adce67c07a51ab6aad11226a1d31d0626d9132 /Gemfile | |
| parent | 4aa41d07e16ca03f5f56b7cc5c136d86d51666c2 (diff) | |
| download | gitlab-ce-1e1f99f2b1b3d79f4b767362fbf8fe1838348175.tar.gz | |
Update gitlab-markup gem to avoid binary name collision53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-github-markup
See https://gitlab.com/gitlab-org/gitlab-ce/issues/53082
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -124,7 +124,7 @@ gem 'seed-fu', '~> 2.3.7' # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' gem 'deckar01-task_list', '2.0.0' -gem 'gitlab-markup', '~> 1.6.4' +gem 'gitlab-markup', '~> 1.6.5' gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'redcarpet', '~> 3.4' gem 'commonmarker', '~> 0.17' |