Verified Commit 053f3638 authored by Kaspar Vollenweider's avatar Kaspar Vollenweider
Browse files

chore(gem-dependencies): rubocop 0.84.0 (was 0.83.0)

Using bundler flags:  rubocop 0.84.0 (was 0.83.0)
parent 2fb5ff73
if Rails.env.development? || Rails.env.test?
# This introduces the `table` statement
# rubocop:disable Style/MixinUsage
extend Hirb::Console
# rubocop:enable Style/MixinUsage
end
......@@ -102,6 +102,7 @@ Metrics/BlockLength:
- factory
- included # for concerns
- test
- configure
Lint/RaiseException:
Enabled: true
......@@ -119,9 +120,12 @@ Layout/FirstArrayElementIndentation:
Layout/FirstHashElementIndentation:
Enabled: true
EnforcedStyle: consistent
Layout/FirstParameterIndentation:
Layout/FirstArgumentIndentation:
Enabled: true
EnforcedStyle: consistent
Exclude:
- app/controllers/assignments_controller.rb
- app/controllers/group_assignments_controller.rb
Layout/HashAlignment:
EnforcedLastArgumentHashStyle: always_inspect
Layout/MultilineMethodCallIndentation:
......
source 'https://rubygems.org'
ruby '2.6.6'
git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
......@@ -22,6 +23,8 @@ gem 'country_select'
gem 'devise'
gem 'devise-i18n'
gem 'devise_invitable'
gem 'factory_bot_rails'
gem 'ffaker'
gem 'i18n_data'
gem 'i18n_rails_helpers'
gem 'jbuilder'
......@@ -54,7 +57,6 @@ gem 'will_paginate'
gem 'wkhtmltopdf-binary'
group :development do
gem 'awesome_print', require: false
gem 'debase', require: false
gem 'debride', require: false
gem 'fasterer', require: false
......@@ -72,14 +74,15 @@ group :development do
end
group :development, :test do
gem 'awesome_rails_console'
gem 'better_errors'
gem 'binding_of_callers'
gem 'factory_bot_rails'
gem 'ffaker'
gem 'hirb'
gem 'hirb-unicode-steakknife', require: 'hirb-unicode'
gem 'listen'
gem 'pdf-reader'
gem 'pry-byebug'
gem 'pry-rails'
gem 'pry-stack_explorer'
gem 'spring'
end
......
......@@ -66,6 +66,10 @@ GEM
autoprefixer-rails (9.7.6)
execjs
awesome_print (1.8.0)
awesome_rails_console (0.4.4)
awesome_print
pry-rails
railties
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
......@@ -191,6 +195,10 @@ GEM
activesupport (>= 4.2.0)
hashery (2.1.2)
highline (2.0.3)
hirb (0.7.3)
hirb-unicode-steakknife (0.0.9)
hirb (~> 0.5)
unicode-display_width (~> 1.1)
htmlentities (4.3.4)
i18n (1.8.2)
concurrent-ruby (~> 1.0)
......@@ -297,6 +305,9 @@ GEM
pry (~> 0.13.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
pry-stack_explorer (0.5.1)
binding_of_caller (~> 0.7)
pry (~> 0.13)
psych (3.1.0)
public_suffix (4.0.5)
puma (4.3.5)
......@@ -480,7 +491,7 @@ PLATFORMS
ruby
DEPENDENCIES
awesome_print
awesome_rails_console
better_errors
binding_of_callers
bootsnap
......@@ -506,6 +517,8 @@ DEPENDENCIES
factory_bot_rails
fasterer
ffaker
hirb
hirb-unicode-steakknife
i18n_data
i18n_rails_helpers
i18n_yaml_sorter
......@@ -526,7 +539,7 @@ DEPENDENCIES
pg
policy-assertions
pry-byebug
pry-rails
pry-stack_explorer
puma
pundit
rails (>= 6.0.0, < 6.1.0)
......@@ -558,5 +571,8 @@ DEPENDENCIES
will_paginate
wkhtmltopdf-binary
RUBY VERSION
ruby 2.6.6p146
BUNDLED WITH
2.1.4
web: bundle exec puma -C config/puma.rb
......@@ -68,6 +68,18 @@ Rails.application.configure do
config.action_mailer.perform_caching = false
if ENV['MAILGUN_SMTP_LOGIN'] && ENV['MAILGUN_SMTP_PASSWORD'] && ENV['MAILGUN_DOMAIN']
config.action_mailer.smtp_settings = {
port: ENV['MAILGUN_SMTP_PORT'],
address: ENV['MAILGUN_SMTP_SERVER'],
user_name: ENV['MAILGUN_SMTP_LOGIN'],
password: ENV['MAILGUN_SMTP_PASSWORD'],
domain: ENV['MAILGUN_DOMAIN'],
authentication: :plain
}
config.action_mailer.delivery_method = :smtp
end
# Ignore bad email addresses and do not raise email delivery errors.
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
# config.action_mailer.raise_delivery_errors = false
......
......@@ -14,7 +14,7 @@ port ENV.fetch('PORT') { 3000 }
# Specifies the `environment` that Puma will run in.
#
environment ENV.fetch('RAILS_ENV') { 'development' }
environment ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
# Specifies the `pidfile` that Puma will use.
pidfile ENV.fetch('PIDFILE') { 'tmp/pids/server.pid' }
......@@ -25,14 +25,24 @@ pidfile ENV.fetch('PIDFILE') { 'tmp/pids/server.pid' }
# Workers do not work on JRuby or Windows (both of which do not support
# processes).
#
# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
workers Integer(ENV['WEB_CONCURRENCY'] || 2)
threads_count = Integer(ENV['RAILS_MAX_THREADS'] || 5)
threads threads_count, threads_count
# Use the `preload_app!` method when specifying a `workers` number.
# This directive tells Puma to first boot the application and load code
# before forking the application. This takes advantage of Copy On Write
# process behavior so workers use less memory.
#
# preload_app!
preload_app!
rackup DefaultRackup
on_worker_boot do
# Worker specific setup for Rails 4.1+
# See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot
ActiveRecord::Base.establish_connection
end
# Allow puma to be restarted by `rails restart` command.
plugin :tmp_restart
......@@ -276,5 +276,5 @@ def production_seed
end
end
production_seed if Rails.env.production?
development_seed if Rails.env.development?
production_seed if Rails.env.production? && ENV['RUN_DEV_SEED_IN_PRODUCTION_ENV'] != '1'
development_seed if Rails.env.development? || ENV['RUN_DEV_SEED_IN_PRODUCTION_ENV'] == '1'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment