diff options
| author | Felipe Artur <fcardozo@gitlab.com> | 2018-03-06 16:28:54 +0000 |
|---|---|---|
| committer | Felipe Artur <fcardozo@gitlab.com> | 2018-03-06 16:28:54 +0000 |
| commit | e77c4e9efe0e19187929e5836cda5a3a59d0f89f (patch) | |
| tree | 91daaa89bb48457456f931c6b818f5e200390b56 /lib/api/api.rb | |
| parent | 1e137c273ca6314d0ed6744910b95f179b1d538c (diff) | |
| parent | 9a8f5a2b605f85ace3c81a32cf1855f79cabde43 (diff) | |
| download | gitlab-ce-e77c4e9efe0e19187929e5836cda5a3a59d0f89f.tar.gz | |
Merge branch 'master' into 'issue_38337'
# Conflicts:
# app/models/group.rb
# db/schema.rb
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index 254e1e786f5..5e93c129bc8 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -108,6 +108,7 @@ module API mount ::API::AccessRequests mount ::API::Applications mount ::API::AwardEmoji + mount ::API::Badges mount ::API::Boards mount ::API::Branches mount ::API::BroadcastMessages @@ -139,6 +140,7 @@ module API mount ::API::PagesDomains mount ::API::Pipelines mount ::API::PipelineSchedules + mount ::API::ProjectExport mount ::API::ProjectImport mount ::API::ProjectHooks mount ::API::Projects |