summaryrefslogtreecommitdiff
path: root/lib/api/api.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-08-29 22:54:12 -0700
committerStan Hu <stanhu@gmail.com>2018-08-29 22:54:12 -0700
commit69eddc14b11b63429b8f2511a1127616c692b94c (patch)
treea94482be144cef60a8ee1b590857ca24f49f418a /lib/api/api.rb
parentbc7a4eedf9fa6681465b622af52c34d49ffb5d0e (diff)
parentf981d4febbbb5103262f4daa858236d9c4ed9d67 (diff)
downloadgitlab-ce-69eddc14b11b63429b8f2511a1127616c692b94c.tar.gz
Merge branch 'master' into sh-test-ldap-clones-via-gitlab-qa
Diffstat (limited to 'lib/api/api.rb')
-rw-r--r--lib/api/api.rb9
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