Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: otwcode/otwarchive
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9669870c0451217cab35ae058991be5c063524a6
Choose a base ref
..
head repository: otwcode/otwarchive
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9bdfcd1c82505f0b45e5aeb536b79054a989e2af
Choose a head ref
Showing with 1 addition and 3 deletions.
  1. +1 −3 app/policies/user_policy.rb
4 changes: 1 addition & 3 deletions app/policies/user_policy.rb
View file
Original file line number Diff line number Diff line change
@@ -47,13 +47,11 @@ def can_destroy_spam_creations?
user_has_roles?(SPAM_CLEANUP_ROLES)
end

<<<<<<< HEAD
def can_view_past?
user_has_roles?(VIEW_PAST_USER_INFO_ROLES)
=======

def can_access_creation_summary?
user_has_roles?(REVIEW_CREATIONS_ROLES)
>>>>>>> master
end

def permitted_attributes