summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-06-06 12:53:58 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-06-06 12:53:58 +0300
commitaa7cef9325f1f4b9db91c28f41fad3d4bc7252f0 (patch)
tree1b0cfd60d15991d225aec6001520cafc8fa74a72 /lib
parent184aa5216731cc51bbab5ce6d8e0b71340a58693 (diff)
parent3cb69f0c0b0049426e6abad0914812a9eef87b04 (diff)
downloadgitlab-ce-aa7cef9325f1f4b9db91c28f41fad3d4bc7252f0.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 1a996846e9d..66c138eb902 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -30,7 +30,7 @@ module API
expose :identities, using: Entities::Identity
expose :can_create_group?, as: :can_create_group
expose :can_create_project?, as: :can_create_project
- expose :two_factor_enabled
+ expose :two_factor_enabled?, as: :two_factor_enabled
expose :external
end