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
This commit is contained in:
commit
0fd4b9d3e2
|
@ -39,7 +39,7 @@ module API
|
||||||
mount ::API::Issues
|
mount ::API::Issues
|
||||||
mount ::API::Keys
|
mount ::API::Keys
|
||||||
mount ::API::Labels
|
mount ::API::Labels
|
||||||
mount ::API::Licenses
|
mount ::API::LicenseTemplates
|
||||||
mount ::API::MergeRequests
|
mount ::API::MergeRequests
|
||||||
mount ::API::Milestones
|
mount ::API::Milestones
|
||||||
mount ::API::Namespaces
|
mount ::API::Namespaces
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
module API
|
module API
|
||||||
# Licenses API
|
# License Templates API
|
||||||
class Licenses < Grape::API
|
class LicenseTemplates < Grape::API
|
||||||
PROJECT_TEMPLATE_REGEX =
|
PROJECT_TEMPLATE_REGEX =
|
||||||
/[\<\{\[]
|
/[\<\{\[]
|
||||||
(project|description|
|
(project|description|
|
|
@ -1,6 +1,6 @@
|
||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe API::Licenses, api: true do
|
describe API::API, api: true do
|
||||||
include ApiHelpers
|
include ApiHelpers
|
||||||
|
|
||||||
describe 'Entity' do
|
describe 'Entity' do
|
Loading…
Reference in New Issue