diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2019-04-05 07:17:34 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2019-04-05 07:17:34 +0300 |
| commit | fa079b6a2fab08d8645822603c3b86f793b8ec71 (patch) | |
| tree | b39a0b57c3204dab475dba5c1a8cc6be85eb53f2 | |
| parent | aaf67fdd30006bc8afa0a86cafb393b056c51cbb (diff) | |
| parent | 8ff87b2ccdd88d7bfa7db25e30d4cb91dea0cea4 (diff) | |
Merge branch 'sh-bump-gitlab-markup-1.7.0' into 'master'
Bump gitlab-markup to 1.7.0
See merge request gitlab-org/gitaly!1182
| -rw-r--r-- | changelogs/unreleased/sh-bump-gitlab-markup-1-7-0.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-7-0.yml b/changelogs/unreleased/sh-bump-gitlab-markup-1-7-0.yml new file mode 100644 index 000000000..f485d0efc --- /dev/null +++ b/changelogs/unreleased/sh-bump-gitlab-markup-1-7-0.yml @@ -0,0 +1,5 @@ +--- +title: Bump gitlab-markup to 1.7.0 +merge_request: 1182 +author: +type: other diff --git a/ruby/Gemfile b/ruby/Gemfile index 6de2bb946..483085968 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -5,7 +5,7 @@ gem 'bundler', '>= 1.16.5' gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 6.1', require: 'linguist' -gem 'gitlab-markup', '~> 1.6.5' +gem 'gitlab-markup', '~> 1.7.0' gem 'gitaly-proto', '~> 1.17.0' gem 'activesupport', '~> 5.0.2' gem 'rdoc', '~> 4.2' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index c2400204e..3263c66ce 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -60,7 +60,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) - gitlab-markup (1.6.5) + gitlab-markup (1.7.0) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) google-protobuf (3.6.1) @@ -186,7 +186,7 @@ DEPENDENCIES github-linguist (~> 6.1) gitlab-gollum-lib (~> 4.2.7.7) gitlab-gollum-rugged_adapter (~> 0.4.4.2) - gitlab-markup (~> 1.6.5) + gitlab-markup (~> 1.7.0) google-protobuf (~> 3.6) grpc (~> 1.15.0) licensee (~> 8.9.0) |