Skip to content

Commit

Permalink
Add review environment and bump devise from 4.3 -> 4.4
Browse files Browse the repository at this point in the history
  Devise pre 4.4 had a bug that caused an issue with ruby 2.5

  heartcombo/devise#4630
  • Loading branch information
bradleyprice committed Mar 12, 2018
1 parent 2d3d576 commit f1649e6
Show file tree
Hide file tree
Showing 5 changed files with 118 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -27,7 +27,7 @@ gem 'uglifier', '>= 1.3.0'
gem 'omniauth', '~>1.7.1'
gem 'omniauth-github', '~>1.3.0'

gem 'devise', '~>4.3.0'
gem 'devise', '~>4.4.0'

# Paperclip
gem 'paperclip', '~> 5.0.0'
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Expand Up @@ -85,7 +85,7 @@ GEM
concurrent-ruby (1.0.5)
connection_pool (2.2.1)
crass (1.0.3)
devise (4.3.0)
devise (4.4.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.2)
Expand Down Expand Up @@ -353,7 +353,7 @@ DEPENDENCIES
byebug
capybara (~> 2.13)
coffee-rails (~> 4.2)
devise (~> 4.3.0)
devise (~> 4.4.0)
factory_bot_rails (~> 4.8.2)
faker (~> 1.8.4)
faktory_worker_ruby
Expand Down Expand Up @@ -386,4 +386,4 @@ DEPENDENCIES
web-console (>= 3.3.0)

BUNDLED WITH
1.16.0
1.16.1
6 changes: 6 additions & 0 deletions config/database.yml
Expand Up @@ -22,3 +22,9 @@ test:

production:
url: <%= ENV.fetch('DATABASE_URL') { '' } %>

review:
<<: *default
host: ''
username: root
database: produciton_review
106 changes: 106 additions & 0 deletions config/environments/review.rb
@@ -0,0 +1,106 @@
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.

# Code is not reloaded between requests.
config.cache_classes = true

# Eager load code on boot. This eager loads most of Rails and
# your application in memory, allowing both threaded web servers
# and those relying on copy on write to perform better.
# Rake tasks automatically ignore this option for performance.
config.eager_load = true

# Full error reports are disabled and caching is turned on.
config.consider_all_requests_local = false
config.action_controller.perform_caching = true

# Attempt to read encrypted secrets from `config/secrets.yml.enc`.
# Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
# `config/secrets.yml.key`.
config.read_encrypted_secrets = true

# Disable serving static files from the `/public` folder by default since
# Apache or NGINX already handles this.
config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?

# Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier
# config.assets.css_compressor = :sass

# Do not fallback to assets pipeline if a precompiled asset is missed.
config.assets.compile = false

# `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb

# Enable serving of images, stylesheets, and JavaScripts from an asset server.
# config.action_controller.asset_host = 'http://assets.example.com'

# Specifies the header that your server uses for sending files.
# config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
# config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX

# Mount Action Cable outside main process or domain
# config.action_cable.mount_path = nil
# config.action_cable.url = 'wss://example.com/cable'
# config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]

# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
# config.force_ssl = true

# Use the lowest log level to ensure availability of diagnostic information
# when problems arise.
config.log_level = :debug

# Prepend all log lines with the following tags.
config.log_tags = [:request_id]

# Use a different cache store in production.
# config.cache_store = :mem_cache_store

# Use a real queuing backend for Active Job (and separate queues per environment)
# config.active_job.queue_adapter = :resque
# config.active_job.queue_name_prefix = "produciton_#{Rails.env}"
config.action_mailer.perform_caching = false

config.action_mailer.default_url_options = { host: "#{ENV['PR_NUMBER']}.testing.produciton.net" }

config.action_mailer.smtp_settings = {
address: "smtp.gmail.com",
port: 587,
domain: "gmail.com",
user_name: ENV["GMAIL_USERNAME"],
password: ENV["GMAIL_PASSWORD"],
authentication: "plain",
enable_starttls_auto: true
}

# 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

# 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

# Send deprecation notices to registered listeners.
config.active_support.deprecation = :notify

# Use default logging formatter so that PID and timestamp are not suppressed.
config.log_formatter = ::Logger::Formatter.new

# Use a different logger for distributed setups.
# require 'syslog/logger'
# config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')

if ENV['RAILS_LOG_TO_STDOUT'].present?
logger = ActiveSupport::Logger.new(STDOUT)
logger.formatter = config.log_formatter
config.logger = ActiveSupport::TaggedLogging.new(logger)
end

config.lograge.enabled = true
config.lograge.formatter = Lograge::Formatters::Logstash.new

# Do not dump schema after migrations.
config.active_record.dump_schema_after_migration = false
end
2 changes: 2 additions & 0 deletions config/secrets.yml
Expand Up @@ -43,3 +43,5 @@ production:
github_secret: <%= ENV["GITHUB_SECRET"] %>
produciton_email: <%= ENV["PRODUCITON_EMAIL"] %>

review:
secret_key_base: 284eadb629144bd4cd8f49ee4ce1ae86fe2aad705944fc6e47e4c52aaf333492ac7ed642002531128bb01afe462f346203d50b57bfd2916d4e20e110278b8178

0 comments on commit f1649e6

Please sign in to comment.