Merge branch 'bugfix/declarative-policy-reloading' into 'master'

bugfix: use `require_dependency` to bring in DeclarativePolicy Closes #34532 See merge request !12571

Merge branch 'bugfix/declarative-policy-reloading' into 'master'
37011af0 · Douwe Maan · 6205e457 · 7765dd6a · 37011af0 · 37011af0
Commit 37011af0 authored Jun 29, 2017 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

ability.rb app/models/ability.rb +1 -1

base_policy.rb app/policies/base_policy.rb +1 -1

projects.rb lib/api/projects.rb +1 -1

No files found.
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
-require 'declarative_policy'
+require_dependency 'declarative_policy'

 class Ability
  class << self

--- a/app/policies/base_policy.rb
+++ b/app/policies/base_policy.rb
-require 'declarative_policy'
+require_dependency 'declarative_policy'

 class BasePolicy < DeclarativePolicy::Base
  desc "User is an instance admin"

--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
-require 'declarative_policy'
+require_dependency 'declarative_policy'

 module API
  # Projects API