diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-16 12:51:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-16 12:51:30 +0200 |
| commit | 5d710b1139b34f2ed6bd556f448fa7248354e758 (patch) | |
| tree | 958a5ff315699f13b4668f190c321291df06e29c /app/controllers/application_controller.rb | |
| parent | 8a58942c80275788cbe069f2d67c396732ec092d (diff) | |
Make file attachment on MediaAttachment optional (#1865)
Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true Clean up old media files when creating a new domain block with reject_media set to true Return remote_url in media attachments API if local file is not present Undo domain block action in admin UI Ability to enable reject_media from admin UI
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0c320177d..e8d7de218 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -8,7 +8,9 @@ class ApplicationController < ActionController::Base force_ssl if: "Rails.env.production? && ENV['LOCAL_HTTPS'] == 'true'" include Localized - helper_method :current_account, :single_user_mode? + + helper_method :current_account + helper_method :single_user_mode? rescue_from ActionController::RoutingError, with: :not_found rescue_from ActiveRecord::RecordNotFound, with: :not_found |