diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-29 20:54:48 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-29 20:54:48 +0000 |
| commit | 37011af0c08a9c22cf4df0fb5655a2f2eff1117d (patch) | |
| tree | 59a8e2aa59a7e14f367f284c899b652de447491f /lib/api | |
| parent | 6205e45727db4d6720b7c3dc6ce010872b4f1628 (diff) | |
| parent | 7765dd6a1d04189da49b8a36ffc5bb8d22e5184f (diff) | |
| download | gitlab-ce-37011af0c08a9c22cf4df0fb5655a2f2eff1117d.tar.gz | |
Merge branch 'bugfix/declarative-policy-reloading' into 'master'
bugfix: use `require_dependency` to bring in DeclarativePolicy
Closes #34532
See merge request !12571
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/projects.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |