DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1464 from tchak/fix-ffi

Browse source 
Lock ffi version to fix builds on Mac
This commit is contained in:
Paul Chavard 2018-02-22 16:49:30 +01:00 committed by GitHub
commit d880eec2d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Gemfile
View file

@ -2,6 +2,9 @@ source 'https://rubygems.org'
gem 'rails', '~> 5.2.0.rc1' gem 'rails', '~> 5.2.0.rc1'
# Temporary lock ffi version. Read more: https://github.com/ffi/ffi/commit/0fef6d44d09018d03c24af7fa4f9fcd38f36b642
gem 'ffi', '1.9.18'
# Use SCSS for stylesheets # Use SCSS for stylesheets
gem 'sass-rails' gem 'sass-rails'
# Use Uglifier as compressor for JavaScript assets # Use Uglifier as compressor for JavaScript assets

3
Gemfile.lock
View file

@ -202,7 +202,7 @@ GEM
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
faraday (0.12.2) faraday (0.12.2)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
ffi (1.9.21) ffi (1.9.18)
fission (0.5.0) fission (0.5.0)
CFPropertyList (~> 2.2) CFPropertyList (~> 2.2)
fog (1.41.0) fog (1.41.0)
@ -789,6 +789,7 @@ DEPENDENCIES
dotenv-rails dotenv-rails
draper draper
factory_bot factory_bot
ffi (= 1.9.18)
fog fog
fog-openstack fog-openstack
font-awesome-rails font-awesome-rails