kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #40701 from dputtick/update-thin-dependency

Browse source 
Update thin to 1.8.0 to fix bundle install error with xcode 12 on MacOS
This commit is contained in:
Kasper Timm Hansen 2020-11-28 01:11:48 +01:00 committed by GitHub
commit 3524dd9789
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Gemfile
View file

@ -78,10 +78,6 @@ group :cable do
gem "redis-namespace", github: "resque/redis-namespace" gem "redis-namespace", github: "resque/redis-namespace"
gem "websocket-client-simple", github: "matthewd/websocket-client-simple", branch: "close-race", require: false gem "websocket-client-simple", github: "matthewd/websocket-client-simple", branch: "close-race", require: false
gem "blade", require: false, platforms: [:ruby]
gem "blade-sauce_labs_plugin", require: false, platforms: [:ruby]
gem "sprockets-export", require: false
end end
# Active Storage # Active Storage
@ -102,6 +98,12 @@ group :ujs do
gem "webdrivers" gem "webdrivers"
end end
# Action View
group :view do
gem "blade", require: false, platforms: [:ruby]
gem "sprockets-export", require: false
end
# Add your own local bundler stuff. # Add your own local bundler stuff.
local_gemfile = File.expand_path(".Gemfile", __dir__) local_gemfile = File.expand_path(".Gemfile", __dir__)
instance_eval File.read local_gemfile if File.exist? local_gemfile instance_eval File.read local_gemfile if File.exist? local_gemfile

7
Gemfile.lock
View file

@ -177,10 +177,6 @@ GEM
thor (>= 0.19.1) thor (>= 0.19.1)
useragent (~> 0.16.7) useragent (~> 0.16.7)
blade-qunit_adapter (2.0.1) blade-qunit_adapter (2.0.1)
blade-sauce_labs_plugin (0.7.3)
childprocess
faraday
selenium-webdriver
bootsnap (1.5.0) bootsnap (1.5.0)
msgpack (~> 1.0) msgpack (~> 1.0)
builder (3.2.4) builder (3.2.4)
@ -497,7 +493,7 @@ GEM
stackprof (0.2.16) stackprof (0.2.16)
sucker_punch (2.1.2) sucker_punch (2.1.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
thin (1.7.2) thin (1.8.0)
daemons (~> 1.0, >= 1.0.9) daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4) eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3) rack (>= 1, < 3)
@ -564,7 +560,6 @@ DEPENDENCIES
bcrypt (~> 3.1.11) bcrypt (~> 3.1.11)
benchmark-ips benchmark-ips
blade blade
blade-sauce_labs_plugin
bootsnap (>= 1.4.4) bootsnap (>= 1.4.4)
byebug byebug
capybara (>= 3.26) capybara (>= 3.26)