diff options
| author | http://jneen.net/ <jneen@jneen.net> | 2017-06-29 11:57:59 -0700 |
|---|---|---|
| committer | http://jneen.net/ <jneen@jneen.net> | 2017-06-29 11:57:59 -0700 |
| commit | 7765dd6a1d04189da49b8a36ffc5bb8d22e5184f (patch) | |
| tree | 59a8e2aa59a7e14f367f284c899b652de447491f | |
| parent | 6205e45727db4d6720b7c3dc6ce010872b4f1628 (diff) | |
| download | gitlab-ce-bugfix/declarative-policy-reloading.tar.gz | |
bugfix: use `require_dependency` to bring in DeclarativePolicybugfix/declarative-policy-reloading
| -rw-r--r-- | app/models/ability.rb | 2 | ||||
| -rw-r--r-- | app/policies/base_policy.rb | 2 | ||||
| -rw-r--r-- | lib/api/projects.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/models/ability.rb b/app/models/ability.rb index d2b8a8447b5..0b6bcbde5d9 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -1,4 +1,4 @@ -require 'declarative_policy' +require_dependency 'declarative_policy' class Ability class << self diff --git a/app/policies/base_policy.rb b/app/policies/base_policy.rb index 00067ce756e..191c2e78a08 100644 --- a/app/policies/base_policy.rb +++ b/app/policies/base_policy.rb @@ -1,4 +1,4 @@ -require 'declarative_policy' +require_dependency 'declarative_policy' class BasePolicy < DeclarativePolicy::Base desc "User is an instance admin" diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 886e97a2638..d0bd64b2972 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -1,4 +1,4 @@ -require 'declarative_policy' +require_dependency 'declarative_policy' module API # Projects API |