Skip to content
Snippets Groups Projects
Unverified Commit 84d5a17f authored by Mayra Cabrera's avatar Mayra Cabrera Committed by GitLab
Browse files

Merge branch 'pin-ffi-version-on-qa-gemfile' into '16-6-stable-ee'

parents eb359b08 321abf71
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -45,6 +45,7 @@ gem 'deprecation_toolkit', '~> 2.0.3', require: false
 
gem 'factory_bot', '~> 6.3.0'
gem 'multi_xml', '0.6.0'
gem 'ffi', '1.15'
 
group :development do
gem 'pry-byebug', '~> 3.10.1', platform: :mri
Loading
Loading
Loading
Loading
@@ -91,9 +91,9 @@ GEM
faraday-net_http (3.0.0)
faraday-retry (2.2.0)
faraday (~> 2.0)
ffi (1.17.0)
ffi-compiler (1.3.2)
ffi (>= 1.15.5)
ffi (1.15.0)
ffi-compiler (1.0.1)
ffi (>= 1.0.0)
rake
fog-core (2.1.0)
builder
Loading
Loading
@@ -349,6 +349,7 @@ DEPENDENCIES
factory_bot (~> 6.3.0)
faker (~> 3.2)
faraday-retry (~> 2.2)
ffi (= 1.15)
fog-core (= 2.1.0)
fog-google (~> 1.19)
gitlab-qa (~> 14)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment