diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2017-01-09 23:36:05 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2017-01-09 23:42:44 +0300 |
| commit | fd6a87283810fa3c6f232cf8b9881f1fbbbbe409 (patch) | |
| tree | b98ea0867aaa56350a8a48d7e6337b4013219618 | |
| parent | 1be3ac8810112e0114d9ada9f8dc5d186a038fdc (diff) | |
Merge branch 'update-gitlab-markup-gem' into 'master'
Update the gitlab-markup gem to the version `1.5.1`
See merge request !8509
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/update-gitlab-markup-gem.yml | 4 |
3 files changed, 8 insertions, 4 deletions
@@ -103,7 +103,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' diff --git a/Gemfile.lock b/Gemfile.lock index 4aebfe818fe..dd40c68021d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -263,7 +263,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab-markup (1.5.0) + gitlab-markup (1.5.1) gitlab_git (10.7.0) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) @@ -897,7 +897,7 @@ DEPENDENCIES gemojione (~> 3.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab-markup (~> 1.5.0) + gitlab-markup (~> 1.5.1) gitlab_git (~> 10.7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) @@ -1030,4 +1030,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.13.6 + 1.13.7 diff --git a/changelogs/unreleased/update-gitlab-markup-gem.yml b/changelogs/unreleased/update-gitlab-markup-gem.yml new file mode 100644 index 00000000000..96cdfd051f0 --- /dev/null +++ b/changelogs/unreleased/update-gitlab-markup-gem.yml @@ -0,0 +1,4 @@ +--- +title: Update the gitlab-markup gem to the version 1.5.1 +merge_request: 8509 +author: |