diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-21 08:49:15 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-21 08:49:15 +0000 |
| commit | ac044ba0d53f17833f0aa97db404e9b49c9b219a (patch) | |
| tree | f317478e268f103bbf4044bd5650cfc1b7af649f | |
| parent | 39b90bcec48f26a5a8c1eea468ffca7d89097f8b (diff) | |
| parent | 0c46598a899e813484a28c8ab726fb043d778af8 (diff) | |
| download | gitlab-ce-ac044ba0d53f17833f0aa97db404e9b49c9b219a.tar.gz | |
Merge branch 'feature/plantuml-restructured-text' into 'master'
Upgrade gitlab-markup gem
See merge request gitlab-org/gitlab-ce!14395
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/14395-upgrade-gitlab-markup.yml | 5 |
3 files changed, 8 insertions, 3 deletions
@@ -116,7 +116,7 @@ gem 'seed-fu', '~> 2.3.5' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' gem 'deckar01-task_list', '2.0.0' -gem 'gitlab-markup', '~> 1.5.1' +gem 'gitlab-markup', '~> 1.6.2' gem 'redcarpet', '~> 3.4' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 4.2' diff --git a/Gemfile.lock b/Gemfile.lock index 90154d98c9c..a19d681b6c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -293,7 +293,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab-markup (1.5.1) + gitlab-markup (1.6.2) gitlab_omniauth-ldap (2.0.4) net-ldap (~> 0.16) omniauth (~> 1.3) @@ -1028,7 +1028,7 @@ DEPENDENCIES gitaly-proto (~> 0.33.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab-markup (~> 1.5.1) + gitlab-markup (~> 1.6.2) gitlab_omniauth-ldap (~> 2.0.4) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) diff --git a/changelogs/unreleased/14395-upgrade-gitlab-markup.yml b/changelogs/unreleased/14395-upgrade-gitlab-markup.yml new file mode 100644 index 00000000000..d1f90fe5eb1 --- /dev/null +++ b/changelogs/unreleased/14395-upgrade-gitlab-markup.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade gitlab-markup gem +merge_request: 14395 +author: Markus Koller +type: other |