diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-07-30 19:39:52 +0300 |
|---|---|---|
| committer | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-07-30 19:39:52 +0300 |
| commit | 366f364ce4cdbbd3eaa9314447f64deb6e5fb889 (patch) | |
| tree | bd3a6ffd915613bad1c43f5ce7ec6d5cf4b7e75d | |
| parent | b9a3433a7f2ec4a9f78ddc40984e2f24987ca2f9 (diff) | |
| parent | 33c36c8269e25f4e7ad6538d4768a6bb01ea418c (diff) | |
Merge branch 'sh-bump-gitlab-markup' into 'master'
Fix reStructuredText not working on Gitaly nodes
See merge request gitlab-org/gitaly!838
| -rw-r--r-- | changelogs/unreleased/sh-bump-gitlab-markup.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.yml b/changelogs/unreleased/sh-bump-gitlab-markup.yml new file mode 100644 index 000000000..47de3dbf0 --- /dev/null +++ b/changelogs/unreleased/sh-bump-gitlab-markup.yml @@ -0,0 +1,5 @@ +--- +title: Fix reStructuredText not working on Gitaly nodes +merge_request: 838 +author: +type: fixed diff --git a/ruby/Gemfile b/ruby/Gemfile index 1a7b87dfb..59d15f0ef 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 0.27.2' gem 'github-linguist', '~> 6.1', require: 'linguist' -gem 'gitlab-markup', '~> 1.6.2' +gem 'gitlab-markup', '~> 1.6.4' gem 'gitaly-proto', '~> 0.107.0', require: 'gitaly' gem 'activesupport', '~> 5.0.2' gem 'rdoc', '~> 4.2' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 6e50b8b0c..8c6114981 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -43,7 +43,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) - gitlab-markup (1.6.3) + gitlab-markup (1.6.4) gitlab-styles (2.0.0) rubocop (~> 0.49) rubocop-gitlab-security (~> 0.1.0) @@ -151,7 +151,7 @@ DEPENDENCIES github-linguist (~> 6.1) gitlab-gollum-lib (~> 4.2) gitlab-gollum-rugged_adapter (~> 0.4.4) - gitlab-markup (~> 1.6.2) + gitlab-markup (~> 1.6.4) gitlab-styles (~> 2.0.0) google-protobuf (= 3.5.1) grpc (~> 1.11.0) |