Relax dependency on ruby-github-markup and ruby-gitaly-proto

This commit is contained in:
Pirate Praveen 2019-02-02 14:29:51 +05:30
parent 56d4f2c5e8
commit dec951cec1
3 changed files with 24 additions and 0 deletions

View file

@ -0,0 +1,11 @@
--- a/Gemfile
+++ b/Gemfile
@@ -407,7 +407,7 @@
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.113.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.113', require: 'gitaly'
gem 'grpc', '~> 1.11'
# Locked until https://github.com/google/protobuf/issues/4210 is closed

View file

@ -0,0 +1,11 @@
--- a/Gemfile
+++ b/Gemfile
@@ -135,7 +135,7 @@
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '2.0'
-gem 'gitlab-markup', '~> 1.6', '>= 1.6.4'
+gem 'github-markup', '~> 1.6', '>= 1.6.4'
gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17'
gem 'RedCloth', '~> 4.3', '>= 4.3.2'

View file

@ -9,6 +9,8 @@
0400-Relax-recaptcha-version.patch
0410-relax-dropzonejs-rails.patch
0420-relax-rdoc.patch
0430-relax-gitaly-proto.patch
0440-use-github-markup.patch
0500-set-webpack-root.patch
0510-remove-dev-dependencies.patch
0520-add-system-lib-path-for-webpack.patch