diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-11-19 22:56:26 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-11-19 22:58:36 +0300 |
| commit | 44bd1e99dde2be7fd8ac097ccc74e00bafaa2643 (patch) | |
| tree | 13c5657048fbcc54fede4ed329b30277a5ada9f3 | |
| parent | b18e75d041444711a5b776a549b40cb09df18df5 (diff) | |
Bump gitlab-markup to 1.6.5
This matches the upgrade made in CE:
https://gitlab.com/gitlab-org/gitlab-ce/issues/53082
| -rw-r--r-- | changelogs/unreleased/sh-bump-gitlab-markup-1-6-5.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/changelogs/unreleased/sh-bump-gitlab-markup-1-6-5.yml b/changelogs/unreleased/sh-bump-gitlab-markup-1-6-5.yml new file mode 100644 index 000000000..3ae53dcfc --- /dev/null +++ b/changelogs/unreleased/sh-bump-gitlab-markup-1-6-5.yml @@ -0,0 +1,5 @@ +--- +title: Bump gitlab-markup to 1.6.5 +merge_request: 975 +author: +type: fixed diff --git a/ruby/Gemfile b/ruby/Gemfile index 016f80284..b8449d270 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -5,7 +5,7 @@ gem 'bundler', '>= 1.16.5' gem 'rugged', '~> 0.27' gem 'github-linguist', '~> 6.1', require: 'linguist' -gem 'gitlab-markup', '~> 1.6.4' +gem 'gitlab-markup', '~> 1.6.5' gem 'gitaly-proto', '~> 0.123.0', require: 'gitaly' gem 'activesupport', '~> 5.0.2' gem 'rdoc', '~> 4.2' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 034085352..d440cb9d1 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -54,7 +54,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) - gitlab-markup (1.6.4) + gitlab-markup (1.6.5) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) google-protobuf (3.6.1) @@ -154,7 +154,7 @@ DEPENDENCIES github-linguist (~> 6.1) gitlab-gollum-lib (~> 4.2) gitlab-gollum-rugged_adapter (~> 0.4.4) - gitlab-markup (~> 1.6.4) + gitlab-markup (~> 1.6.5) google-protobuf (~> 3.6) grpc (~> 1.15.0) licensee (~> 8.9.0) |