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.

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

Bump webrick from 1.8.1 to 1.8.2 #79

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ AWS_ACCESS_KEY_ID=fakeid
AWS_SECRET_ACCESS_KEY=fakekey
AWS_REGION=fakeregion
SECRET_KEY_BASE=fakekey
MAILGUN_API_KEY=fakekey
SES_USERNAME=fakeusername
SES_PASSWORD=fakepassword
SES_URL=fakeurl
EMAIL_DOMAIN=
FRONTEND_URL=
RECAPTCHA_SECRET_KEY=fakekey
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ gem 'rails'
gem 'active_model_serializers'
gem 'active_storage_validations'
gem 'acts_as_votable'
gem "aws-sdk-s3", require: false
gem "aws-sdk-s3", require: false
gem "aws-sdk-ses", require: false
gem 'devise'
gem 'doorkeeper', '~> 5.4'
gem 'kaminari'
Expand Down
6 changes: 5 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ GEM
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sdk-ses (1.69.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.9.1)
aws-eventstream (~> 1, >= 1.0.2)
base64 (0.2.0)
Expand Down Expand Up @@ -413,7 +416,7 @@ GEM
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.8.1)
webrick (1.8.2)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand All @@ -439,6 +442,7 @@ DEPENDENCIES
active_storage_validations
acts_as_votable
aws-sdk-s3
aws-sdk-ses
climate_control
database_cleaner
devise
Expand Down
16 changes: 10 additions & 6 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,17 @@
# config.action_mailer.raise_delivery_errors = false
config.action_mailer.default_url_options = { host: 'kardies.gr' }

# MAILGUN settings
config.action_mailer.delivery_method = :mailgun

config.action_mailer.mailgun_settings = {
api_key: ENV['MAILGUN_API_KEY'],
domain: ENV['EMAIL_DOMAIN']
# AWS SES settings
config.action_mailer.delivery_method = :smtp
config.action_mailer.smtp_settings = {
address: ENV['SES_URL'],
port: 587,
user_name: ENV['SES_USER'],
password: ENV['SES_PASSWORD'],
authentication: :login,
enable_starttls_auto: true
}

# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
# the I18n.default_locale when a translation cannot be found).
config.i18n.fallbacks = true
Expand Down
Loading