diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-08-28 15:02:27 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-08-28 15:02:54 -0700 |
| commit | 04845fdeae75ba5de7c93992a5d55663edf647e0 (patch) | |
| tree | 345529d947f1347d08f527447c202897b8164b56 /lib/api/api.rb | |
| parent | 27580720e1c26e0508960152753d2230cebbe681 (diff) | |
| parent | e19f2531366b0a897c738af1d1e3905b8b72ace4 (diff) | |
| download | gitlab-ce-04845fdeae75ba5de7c93992a5d55663edf647e0.tar.gz | |
Merge remote-tracking branch 'origin/master' into dev/master
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 |