diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-06 16:33:52 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-06 16:33:52 +0200 |
| commit | d9b292f8726e46050e2d882a9a9fc1be95007d18 (patch) | |
| tree | 6f254d2829d113b41d18a12b43be5a10a96847e3 /lib | |
| parent | 7ad7e10feed624e263b5b80f5cafd4b0ed900ad7 (diff) | |
| parent | aa7cef9325f1f4b9db91c28f41fad3d4bc7252f0 (diff) | |
| download | gitlab-ce-d9b292f8726e46050e2d882a9a9fc1be95007d18.tar.gz | |
Merge remote-tracking branch 'origin/master' into rename-ci-commit
# Conflicts:
# spec/features/builds_spec.rb
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 2 |
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 |