cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/2051'

Browse source
This commit is contained in:
Tom Hughes 2018-11-08 17:51:23 +00:00
commit 6ca22de4f2
5 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/redactions_controller.rb
View file

@ -3,8 +3,9 @@ class RedactionsController < ApplicationController
before_action :authorize_web
before_action :set_locale
before_action :require_user, :only => [:new, :create, :edit, :update, :destroy]
before_action :require_moderator, :only => [:new, :create, :edit, :update, :destroy]
authorize_resource
before_action :lookup_redaction, :only => [:show, :edit, :update, :destroy]
before_action :check_database_readable
before_action :check_database_writable, :only => [:create, :update, :destroy]

5
app/controllers/user_blocks_controller.rb
View file

@ -3,8 +3,9 @@ class UserBlocksController < ApplicationController
before_action :authorize_web
before_action :set_locale
before_action :require_user, :only => [:new, :create, :edit, :update, :revoke]
before_action :require_moderator, :only => [:new, :create, :edit, :update, :revoke]
authorize_resource
before_action :lookup_user, :only => [:new, :create, :blocks_on, :blocks_by]
before_action :lookup_user_block, :only => [:show, :edit, :update, :revoke]
before_action :require_valid_params, :only => [:create, :update]