diff options
author | Stan Hu <stanhu@gmail.com> | 2018-08-29 10:54:24 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-08-29 10:54:24 -0700 |
commit | 14105b5ee9fe83313f3410dd717836fd36497696 (patch) | |
tree | 8ae8aa434551642126df3089864a05f25abb693e /lib/api/api.rb | |
parent | 7e7e52536b876a9381c6efb4d858d3a49d1f9640 (diff) | |
parent | 380c7169cbcc67b4046bc63b62fd1c452c76ad12 (diff) | |
download | gitlab-ce-14105b5ee9fe83313f3410dd717836fd36497696.tar.gz |
Merge branch 'master' into sh-add-object-storage-qa
Diffstat (limited to 'lib/api/api.rb')
-rw-r--r-- | lib/api/api.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index e2ad3c5f4e3..c000666d992 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -99,12 +99,13 @@ module API mount ::API::Features mount ::API::Files mount ::API::GroupBoards - mount ::API::Groups mount ::API::GroupMilestones + mount ::API::Groups + mount ::API::GroupVariables mount ::API::Internal mount ::API::Issues - mount ::API::Jobs mount ::API::JobArtifacts + mount ::API::Jobs mount ::API::Keys mount ::API::Labels mount ::API::Lint @@ -122,11 +123,12 @@ module API mount ::API::ProjectExport mount ::API::ProjectImport mount ::API::ProjectHooks - mount ::API::Projects mount ::API::ProjectMilestones + mount ::API::Projects mount ::API::ProjectSnapshots mount ::API::ProjectSnippets mount ::API::ProtectedBranches + mount ::API::ProtectedTags mount ::API::Repositories mount ::API::Runner mount ::API::Runners @@ -143,7 +145,6 @@ module API mount ::API::Triggers mount ::API::Users mount ::API::Variables - mount ::API::GroupVariables mount ::API::Version mount ::API::Wikis |