summaryrefslogtreecommitdiff
path: root/app/models/ability.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-07-06 12:43:51 -0400
committerRobert Speicher <rspeicher@gmail.com>2017-07-06 12:43:51 -0400
commiteef068754af7437baf327c5cb4e2b454ba40a617 (patch)
tree3583327140b2994432de317b4ac06d66b274b430 /app/models/ability.rb
parent9eeba8fb49c5da7cf0b2c22bc33cbd33a83918ed (diff)
parent9274c3c1598f3ff32339e681d5812feeb0f62605 (diff)
downloadgitlab-ce-eef068754af7437baf327c5cb4e2b454ba40a617.tar.gz
Merge branch 'master' into rs-sign_in
Diffstat (limited to 'app/models/ability.rb')
-rw-r--r--app/models/ability.rb2
1 files changed, 1 insertions, 1 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