diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-01-13 05:32:03 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-01-13 05:32:03 +0000 |
| commit | f80ab37cc1450fb9dc61149dbc10c245f3681e45 (patch) | |
| tree | 73c1a9e2d090dbc0da33d9f865facfbf21c1cb29 | |
| parent | 2159802c5fa833bb748ad62ce80ab6895e918985 (diff) | |
| parent | 6afa2d058ee8cb67fda7b2f7cba71304acf21948 (diff) | |
| download | gitlab-ce-f80ab37cc1450fb9dc61149dbc10c245f3681e45.tar.gz | |
Merge branch '26627-update-gitlab-markup-to-1-5-1-again' into 'master'
Update gitlab-markup back to 1.5.1 in Gemfile
Closes #26627
See merge request !8550
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -101,7 +101,7 @@ gem 'seed-fu', '~> 2.3.5' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' 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 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 4.2' |