diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-05-25 14:18:40 +0300 |
|---|---|---|
| committer | Kim Carlbäcker <kim.carlbacker@gmail.com> | 2018-05-25 14:18:40 +0300 |
| commit | 6cc8a1e55b027ab4d9b34fffb929c24b9000c82f (patch) | |
| tree | dcfd16b2c14351cc31f6c1d38d7b9a3c0008d904 | |
| parent | b633db8df52b73e815315391f0f955fe5d0b4b68 (diff) | |
Use the same faraday gem version as gitlab-ce
| -rw-r--r-- | changelogs/unreleased/pin-faraday-0-12.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile | 1 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/changelogs/unreleased/pin-faraday-0-12.yml b/changelogs/unreleased/pin-faraday-0-12.yml new file mode 100644 index 000000000..0158dce5e --- /dev/null +++ b/changelogs/unreleased/pin-faraday-0-12.yml @@ -0,0 +1,5 @@ +--- +title: Use the same faraday gem version as gitlab-ce +merge_request: 733 +author: +type: other diff --git a/ruby/Gemfile b/ruby/Gemfile index fd8e6b402..1f83d7088 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -10,6 +10,7 @@ gem 'gitlab-gollum-lib', '~> 4.2', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false gem 'grpc', '~> 1.10.0' gem 'sentry-raven', '~> 2.7.2', require: false +gem 'faraday', '~> 0.12' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index fb6355322..740ebb159 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -13,7 +13,7 @@ GEM concurrent-ruby (1.0.5) diff-lcs (1.3) escape_utils (1.1.1) - faraday (0.14.0) + faraday (0.12.2) multipart-post (>= 1.2, < 3) gemojione (3.3.0) json @@ -141,6 +141,7 @@ PLATFORMS DEPENDENCIES activesupport (~> 5.0.2) + faraday (~> 0.12) gitaly-proto (~> 0.99.0) github-linguist (~> 5.3.3) gitlab-gollum-lib (~> 4.2) |