Skip to content

Commit

Permalink
Merge pull request #141 from diowa/dependabot/bundler/rubocop-0.86.0
Browse files Browse the repository at this point in the history
Bump rubocop from 0.85.1 to 0.86.0
  • Loading branch information
tagliala committed Jun 23, 2020
2 parents f3854fe + 8409949 commit 7b82f1e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ group :development, :test do
gem 'pry-byebug', '~> 3.9'
gem 'pry-rails', '~> 0.3.9'
gem 'rspec-rails', '~> 4.0'
gem 'rubocop', '~> 0.85.1', require: false
gem 'rubocop', '~> 0.86.0', require: false
gem 'rubocop-performance', '~> 1.6', require: false
gem 'rubocop-rails', '~> 2.6', require: false
gem 'rubocop-rspec', '~> 1.40', require: false
Expand Down
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ GEM
nio4r (2.5.2)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
parallel (1.19.1)
parser (2.7.1.3)
ast (~> 2.4.0)
parallel (1.19.2)
parser (2.7.1.4)
ast (~> 2.4.1)
pg (1.2.3)
pry (0.13.1)
coderay (~> 1.1)
Expand Down Expand Up @@ -197,13 +197,13 @@ GEM
rspec-mocks (~> 3.9)
rspec-support (~> 3.9)
rspec-support (3.9.3)
rubocop (0.85.1)
rubocop (0.86.0)
parallel (~> 1.10)
parser (>= 2.7.0.1)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.7)
rexml
rubocop-ast (>= 0.0.3)
rubocop-ast (>= 0.0.3, < 1.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (0.0.3)
Expand Down Expand Up @@ -307,7 +307,7 @@ DEPENDENCIES
rack-timeout (~> 0.6.0)
rails (= 6.0.3.2)
rspec-rails (~> 4.0)
rubocop (~> 0.85.1)
rubocop (~> 0.86.0)
rubocop-performance (~> 1.6)
rubocop-rails (~> 2.6)
rubocop-rspec (~> 1.40)
Expand Down
8 changes: 4 additions & 4 deletions config/puma.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@
# the maximum value specified for Puma. Default is set to 5 threads for minimum
# and maximum; this matches the default thread size of Active Record.
#
max_threads_count = ENV.fetch('RAILS_MAX_THREADS') { 5 }
max_threads_count = ENV.fetch('RAILS_MAX_THREADS', 5)
min_threads_count = ENV.fetch('RAILS_MIN_THREADS') { max_threads_count }
threads min_threads_count, max_threads_count

# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
#
port ENV.fetch('PORT') { 3000 }
port ENV.fetch('PORT', 3000)

# Specifies the `environment` that Puma will run in.
#
environment ENV.fetch('RAILS_ENV') { 'development' }
environment ENV.fetch('RAILS_ENV', 'development')

# Specifies the `pidfile` that Puma will use.
pidfile ENV.fetch('PIDFILE') { 'tmp/pids/server.pid' }
pidfile ENV.fetch('PIDFILE', 'tmp/pids/server.pid')

# Specifies the number of `workers` to boot in clustered mode.
# Workers are forked web server processes. If using threads and workers together
Expand Down

0 comments on commit 7b82f1e

Please sign in to comment.