mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix code style

pull/6/head^2
Eugen Rochko 2017-01-21 22:19:13 +01:00
parent d72dd38c13
commit e028406db4
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/environments/development.rb
View File

@ -62,15 +62,10 @@ Rails.application.configure do
# routes, locales, etc. This feature depends on the listen gem. # routes, locales, etc. This feature depends on the listen gem.
# config.file_watcher = ActiveSupport::EventedFileUpdateChecker # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
# If usng a Heroku, Vagrant or generic remote development environment, # If using a Heroku, Vagrant or generic remote development environment,
# use letter_opener_web, accessible at /letter_opener. # use letter_opener_web, accessible at /letter_opener.
#
# Otherwise, use letter_opener, which launches a browser window to view sent mail. # Otherwise, use letter_opener, which launches a browser window to view sent mail.
if (ENV['HEROKU'] || ENV['VAGRANT'] || ENV['REMOTE_DEV']) config.action_mailer.delivery_method = (ENV['HEROKU'] || ENV['VAGRANT'] || ENV['REMOTE_DEV']) ? :letter_opener_web : :letter_opener
config.action_mailer.delivery_method = :letter_opener_web
else
config.action_mailer.delivery_method = :letter_opener
end
config.after_initialize do config.after_initialize do
Bullet.enable = true Bullet.enable = true

7
config/routes.rb
View File

@ -3,12 +3,7 @@
require 'sidekiq/web' require 'sidekiq/web'
Rails.application.routes.draw do Rails.application.routes.draw do
mount LetterOpenerWeb::Engine, at: 'letter_opener' if Rails.env.development?
# Development-only routes
if Rails.env.development?
mount LetterOpenerWeb::Engine, at: "/letter_opener"
end
mount ActionCable.server, at: 'cable' mount ActionCable.server, at: 'cable'
authenticate :user, lambda { |u| u.admin? } do authenticate :user, lambda { |u| u.admin? } do