diff options
author | Robert Speicher <robert@gitlab.com> | 2016-06-27 20:15:31 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-06-27 20:15:31 +0000 |
commit | 0fd4b9d3e2c800e728e17e919fa7369b3322c65b (patch) | |
tree | 38172dc6db31644254dd3b5a19eb6e364f170525 | |
parent | e4dacb353edf6129897d1bbfa3977da9487fa78c (diff) | |
parent | 1910fd05aec4c04adf82e8dc10c6404d9afb63f3 (diff) | |
download | gitlab-ce-0fd4b9d3e2c800e728e17e919fa7369b3322c65b.tar.gz |
Merge branch 'rename_license_template_api' into 'master'
Rename Licenses API to License Templates API
## What does this MR do?
Earlier I renamed this in EE, thinking license templates was an EE-only feature. This backports that change to CE. Thanks to @vsizov for pointing out this error.
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/400 for the EE merge request.
See merge request !4957
-rw-r--r-- | lib/api/api.rb | 2 | ||||
-rw-r--r-- | lib/api/license_templates.rb (renamed from lib/api/licenses.rb) | 4 | ||||
-rw-r--r-- | spec/requests/api/license_templates_spec.rb (renamed from spec/requests/api/licenses_spec.rb) | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index f8f680a6311..c3fff8b2f8f 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -39,7 +39,7 @@ module API mount ::API::Issues mount ::API::Keys mount ::API::Labels - mount ::API::Licenses + mount ::API::LicenseTemplates mount ::API::MergeRequests mount ::API::Milestones mount ::API::Namespaces diff --git a/lib/api/licenses.rb b/lib/api/license_templates.rb index be0e113fbcb..d0552299ed0 100644 --- a/lib/api/licenses.rb +++ b/lib/api/license_templates.rb @@ -1,6 +1,6 @@ module API - # Licenses API - class Licenses < Grape::API + # License Templates API + class LicenseTemplates < Grape::API PROJECT_TEMPLATE_REGEX = /[\<\{\[] (project|description| diff --git a/spec/requests/api/licenses_spec.rb b/spec/requests/api/license_templates_spec.rb index 80c33e4b195..9a1894d63a2 100644 --- a/spec/requests/api/licenses_spec.rb +++ b/spec/requests/api/license_templates_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe API::Licenses, api: true do +describe API::API, api: true do include ApiHelpers describe 'Entity' do |