Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update thin to 1.8.0 to fix bundle install error with xcode 12 on MacOS #40701

Merged
merged 2 commits into from
Nov 28, 2020
Merged

Update thin to 1.8.0 to fix bundle install error with xcode 12 on MacOS #40701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6c9bdd
Use thin 1.8.0
dputtick Nov 26, 2020
e87e670
Move unused build gems from ActionCable group
dputtick Nov 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@ group :cable do
gem "redis-namespace", github: "resque/redis-namespace"

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

# Active Storage
Expand All @@ -102,6 +98,12 @@ group :ujs do
gem "webdrivers"
end

# Action View
group :view do
gem "blade", require: false, platforms: [:ruby]
gem "sprockets-export", require: false
end

# Add your own local bundler stuff.
local_gemfile = File.expand_path(".Gemfile", __dir__)
instance_eval File.read local_gemfile if File.exist? local_gemfile
Expand Down
7 changes: 1 addition & 6 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,6 @@ GEM
thor (>= 0.19.1)
useragent (~> 0.16.7)
blade-qunit_adapter (2.0.1)
blade-sauce_labs_plugin (0.7.3)
childprocess
faraday
selenium-webdriver
bootsnap (1.5.0)
msgpack (~> 1.0)
builder (3.2.4)
Expand Down Expand Up @@ -497,7 +493,7 @@ GEM
stackprof (0.2.16)
sucker_punch (2.1.2)
concurrent-ruby (~> 1.0)
thin (1.7.2)
thin (1.8.0)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
Expand Down Expand Up @@ -564,7 +560,6 @@ DEPENDENCIES
bcrypt (~> 3.1.11)
benchmark-ips
blade
blade-sauce_labs_plugin
bootsnap (>= 1.4.4)
byebug
capybara (>= 3.26)
Expand Down