diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-22 12:09:27 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-22 12:09:27 +0000 |
| commit | 011ddb51b40897bc13a75d78c9e992f559cbde48 (patch) | |
| tree | d2f25aa76ab1466ecca82d2cf07e3594b8d7addc /lib/api/api.rb | |
| parent | a75cce1febf0403d66631841fff3bfbeefbfe6e3 (diff) | |
| parent | eb421c88ee2a57a437b9b14ba7447a04720354ac (diff) | |
| download | gitlab-ce-011ddb51b40897bc13a75d78c9e992f559cbde48.tar.gz | |
Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'
# Conflicts:
# db/schema.rb
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 e953f3d2eca..754549f72f0 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -138,6 +138,7 @@ module API mount ::API::PagesDomains mount ::API::Pipelines mount ::API::PipelineSchedules + mount ::API::ProjectImport mount ::API::ProjectHooks mount ::API::Projects mount ::API::ProjectMilestones |