diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2019-07-10 05:56:23 +0000 |
|---|---|---|
| committer | Marcel Amirault <mamirault@gitlab.com> | 2019-07-10 05:56:23 +0000 |
| commit | 2b03a0c2cf699074ec37a863e5c752a2cab2b133 (patch) | |
| tree | 7ebc289d2ec498fcebf8ae454cdb1eb1ef500dbd /lib/api/api.rb | |
| parent | c0deda7a86796c5de6ebe376c83f55af0965bde3 (diff) | |
| parent | 810df4fb51bf3db4016c5f7458599331d4586300 (diff) | |
| download | gitlab-ce-docs-hard-tabs.tar.gz | |
Merge branch 'master' into 'docs-hard-tabs'docs-hard-tabs
# Conflicts:
# doc/administration/pseudonymizer.md
# doc/administration/uploads.md
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index 42499c5b41e..7016a66593d 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -166,6 +166,7 @@ module API mount ::API::Templates mount ::API::Todos mount ::API::Triggers + mount ::API::UserCounts mount ::API::Users mount ::API::Variables mount ::API::Version |