diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-10 23:01:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-10 23:01:56 +0200 |
| commit | c64eef12069c3476f9956dfaaf6a3a9f91c14e2d (patch) | |
| tree | c8048db1bc718663c5ed33c8b225544d5e37f98b /app/controllers/media_controller.rb | |
| parent | b45f555a0c7a7d50ed7640b938eb8b5a671a0e10 (diff) | |
| parent | 7778de467cd35fa4a514dd97ced0d19675f3b9d9 (diff) | |
Merge pull request #1102 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/media_controller.rb')
| -rw-r--r-- | app/controllers/media_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb index 8e1624ce1..a245db2d1 100644 --- a/app/controllers/media_controller.rb +++ b/app/controllers/media_controller.rb @@ -3,6 +3,8 @@ class MediaController < ApplicationController include Authorization + skip_before_action :store_current_location + before_action :set_media_attachment before_action :verify_permitted_status! |