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

Merge branch 'rename_license_template_api' into 'master'
0fd4b9d3 · Robert Speicher · e4dacb35 · 1910fd05 · 0fd4b9d3 · 0fd4b9d3
Commit 0fd4b9d3 authored Jun 27, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

api.rb lib/api/api.rb +1 -1

license_templates.rb lib/api/license_templates.rb +2 -2

license_templates_spec.rb spec/requests/api/license_templates_spec.rb +1 -1

No files found.
--- 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

--- a/lib/api/licenses.rb
+++ b/lib/api/licenses.rb
 module API
-  # Licenses API
-  class Licenses < Grape::API
+  # License Templates API
+  class LicenseTemplates < Grape::API
    PROJECT_TEMPLATE_REGEX =
      /[\<\{\[]
        (project|description|

--- a/spec/requests/api/licenses_spec.rb
+++ b/spec/requests/api/licenses_spec.rb
 require 'spec_helper'

-describe API::Licenses, api: true  do
+describe API::API, api: true  do
  include ApiHelpers

  describe 'Entity' do