Merge branch '5987-project-templates-api' into 'master'

Add a new project-specific templates API endpoint (EE)

See merge request gitlab-org/gitlab-ee!7776

app/assets/javascripts/api.js

@@ -15,13 +15,10 @@ const Api = {
   mergeRequestChangesPath: '/api/:version/projects/:id/merge_requests/:mrid/changes',
   mergeRequestVersionsPath: '/api/:version/projects/:id/merge_requests/:mrid/versions',
   groupLabelsPath: '/groups/:namespace_path/-/labels',
-  templatesPath: '/api/:version/templates/:key',
-  licensePath: '/api/:version/templates/licenses/:key',
-  gitignorePath: '/api/:version/templates/gitignores/:key',
-  gitlabCiYmlPath: '/api/:version/templates/gitlab_ci_ymls/:key',
   ldapGroupsPath: '/api/:version/ldap/:provider/groups.json',
-  dockerfilePath: '/api/:version/templates/dockerfiles/:key',
   issuableTemplatePath: '/:namespace_path/:project_path/templates/:type/:key',
+  projectTemplatePath: '/api/:version/projects/:id/templates/:type/:key',
+  projectTemplatesPath: '/api/:version/projects/:id/templates/:type',
   usersPath: '/api/:version/users.json',
   userStatusPath: '/api/:version/user/status',
   commitPath: '/api/:version/projects/:id/repository/commits',
@@ -198,29 +195,29 @@ const Api = {
     return axios.get(url);
   },
 
-  // Return text for a specific license
-  licenseText(key, data, callback) {
-    const url = Api.buildUrl(Api.licensePath).replace(':key', key);
-    return axios
-      .get(url, {
-        params: data,
-      })
-      .then(res => callback(res.data));
-  },
+  projectTemplate(id, type, key, options, callback) {
+    const url = Api.buildUrl(this.projectTemplatePath)
+      .replace(':id', encodeURIComponent(id))
+      .replace(':type', type)
+      .replace(':key', encodeURIComponent(key));
 
-  gitignoreText(key, callback) {
-    const url = Api.buildUrl(Api.gitignorePath).replace(':key', key);
-    return axios.get(url).then(({ data }) => callback(data));
-  },
+    return axios.get(url, { params: options }).then(res => {
+      if (callback) callback(res.data);
 
-  gitlabCiYml(key, callback) {
-    const url = Api.buildUrl(Api.gitlabCiYmlPath).replace(':key', key);
-    return axios.get(url).then(({ data }) => callback(data));
+      return res;
+    });
   },
 
-  dockerfileYml(key, callback) {
-    const url = Api.buildUrl(Api.dockerfilePath).replace(':key', key);
-    return axios.get(url).then(({ data }) => callback(data));
+  projectTemplates(id, type, params = {}, callback) {
+    const url = Api.buildUrl(this.projectTemplatesPath)
+      .replace(':id', encodeURIComponent(id))
+      .replace(':type', type);
+
+    return axios.get(url, { params }).then(res => {
+      if (callback) callback(res.data);
+
+      return res;
+    });
   },
 
   issueTemplate(namespacePath, projectPath, key, type, callback) {
@@ -278,12 +275,6 @@ const Api = {
     });
   },
 
-  templates(key, params = {}) {
-    const url = Api.buildUrl(this.templatesPath).replace(':key', key);
-
-    return axios.get(url, { params });
-  },
-
   approverUsers(search, options, callback = $.noop) {
     const url = Api.buildUrl('/autocomplete/users.json');
     return axios

app/assets/javascripts/blob/file_template_mediator.js

-/* eslint-disable class-methods-use-this */
+import Api from '~/api';
 
 import $ from 'jquery';
 import Flash from '../flash';
@@ -9,9 +9,10 @@ import GitignoreSelector from './template_selectors/gitignore_selector';
 import LicenseSelector from './template_selectors/license_selector';
 
 export default class FileTemplateMediator {
-  constructor({ editor, currentAction }) {
+  constructor({ editor, currentAction, projectId }) {
     this.editor = editor;
     this.currentAction = currentAction;
+    this.projectId = projectId;
 
     this.initTemplateSelectors();
     this.initTemplateTypeSelector();
@@ -33,8 +34,7 @@ export default class FileTemplateMediator {
   initTemplateTypeSelector() {
     this.typeSelector = new FileTemplateTypeSelector({
       mediator: this,
-      dropdownData: this.templateSelectors
-        .map((templateSelector) => {
+      dropdownData: this.templateSelectors.map(templateSelector => {
         const cfg = templateSelector.config;
 
         return {
@@ -89,7 +89,7 @@ export default class FileTemplateMediator {
   }
 
   listenForPreviewMode() {
-    this.$navLinks.on('click', 'a', (e) => {
+    this.$navLinks.on('click', 'a', e => {
       const urlPieces = e.target.href.split('#');
       const hash = urlPieces[1];
       if (hash === 'preview') {
@@ -105,7 +105,7 @@ export default class FileTemplateMediator {
       e.preventDefault();
     }
 
-    this.templateSelectors.forEach((selector) => {
+    this.templateSelectors.forEach(selector => {
       if (selector.config.key === item.key) {
         selector.show();
       } else {
@@ -126,8 +126,8 @@ export default class FileTemplateMediator {
     selector.renderLoading();
     // in case undo menu is already already there
     this.destroyUndoMenu();
-    this.fetchFileTemplate(selector.config.endpoint, query, data)
-      .then((file) => {
+    this.fetchFileTemplate(selector.config.type, query, data)
+      .then(file => {
         this.showUndoMenu();
         this.setEditorContent(file);
         this.setFilename(selector.config.name);
@@ -138,7 +138,7 @@ export default class FileTemplateMediator {
 
   displayMatchedTemplateSelector() {
     const currentInput = this.getFilename();
-    this.templateSelectors.forEach((selector) => {
+    this.templateSelectors.forEach(selector => {
       const match = selector.config.pattern.test(currentInput);
 
       if (match) {
@@ -149,15 +149,11 @@ export default class FileTemplateMediator {
     });
   }
 
-  fetchFileTemplate(apiCall, query, data) {
-    return new Promise((resolve) => {
+  fetchFileTemplate(type, query, data = {}) {
+    return new Promise(resolve => {
       const resolveFile = file => resolve(file);
 
-      if (!data) {
-        apiCall(query, resolveFile);
-      } else {
-        apiCall(query, data, resolveFile);
-      }
+      Api.projectTemplate(this.projectId, type, query, data, resolveFile);
     });
   }
 

app/assets/javascripts/blob/template_selector.js

@@ -66,9 +66,6 @@ export default class TemplateSelector {
     // be added by all subclasses.
   }
 
-  // To be implemented on the extending class
-  // e.g. Api.gitlabCiYml(query.name, file => this.setEditorContent(file));
-
   setEditorContent(file, { skipFocus } = {}) {
     if (!file) return;
 

app/assets/javascripts/blob/template_selectors/ci_yaml_selector.js

-import Api from '../../api';
-
 import FileTemplateSelector from '../file_template_selector';
 
 export default class BlobCiYamlSelector extends FileTemplateSelector {
@@ -9,7 +7,7 @@ export default class BlobCiYamlSelector extends FileTemplateSelector {
       key: 'gitlab-ci-yaml',
       name: '.gitlab-ci.yml',
       pattern: /(.gitlab-ci.yml)/,
-      endpoint: Api.gitlabCiYml,
+      type: 'gitlab_ci_ymls',
       dropdown: '.js-gitlab-ci-yml-selector',
       wrapper: '.js-gitlab-ci-yml-selector-wrap',
     };

app/assets/javascripts/blob/template_selectors/dockerfile_selector.js

-import Api from '../../api';
-
 import FileTemplateSelector from '../file_template_selector';
 
 export default class DockerfileSelector extends FileTemplateSelector {
@@ -9,7 +7,7 @@ export default class DockerfileSelector extends FileTemplateSelector {
       key: 'dockerfile',
       name: 'Dockerfile',
       pattern: /(Dockerfile)/,
-      endpoint: Api.dockerfileYml,
+      type: 'dockerfiles',
       dropdown: '.js-dockerfile-selector',
       wrapper: '.js-dockerfile-selector-wrap',
     };

app/assets/javascripts/blob/template_selectors/gitignore_selector.js

-import Api from '../../api';
-
 import FileTemplateSelector from '../file_template_selector';
 
 export default class BlobGitignoreSelector extends FileTemplateSelector {
@@ -9,7 +7,7 @@ export default class BlobGitignoreSelector extends FileTemplateSelector {
       key: 'gitignore',
       name: '.gitignore',
       pattern: /(.gitignore)/,
-      endpoint: Api.gitignoreText,
+      type: 'gitignores',
       dropdown: '.js-gitignore-selector',
       wrapper: '.js-gitignore-selector-wrap',
     };

app/assets/javascripts/blob/template_selectors/license_selector.js

-import Api from '../../api';
-
 import FileTemplateSelector from '../file_template_selector';
 
 export default class BlobLicenseSelector extends FileTemplateSelector {
@@ -9,7 +7,7 @@ export default class BlobLicenseSelector extends FileTemplateSelector {
       key: 'license',
       name: 'LICENSE',
       pattern: /^(.+\/)?(licen[sc]e|copying)($|\.)/i,
-      endpoint: Api.licenseText,
+      type: 'licenses',
       dropdown: '.js-license-selector',
       wrapper: '.js-license-selector-wrap',
     };

app/assets/javascripts/blob_edit/blob_bundle.js

@@ -15,8 +15,9 @@ export default () => {
     const assetsPath = editBlobForm.data('assetsPrefix');
     const blobLanguage = editBlobForm.data('blobLanguage');
     const currentAction = $('.js-file-title').data('currentAction');
+    const projectId = editBlobForm.data('project-id');
 
-    new EditBlob(`${urlRoot}${assetsPath}`, blobLanguage, currentAction);
+    new EditBlob(`${urlRoot}${assetsPath}`, blobLanguage, currentAction, projectId);
     new NewCommitForm(editBlobForm);
   }
 

app/assets/javascripts/blob_edit/edit_blob.js

@@ -7,11 +7,11 @@ import { __ } from '~/locale';
 import TemplateSelectorMediator from '../blob/file_template_mediator';
 
 export default class EditBlob {
-  constructor(assetsPath, aceMode, currentAction) {
+  constructor(assetsPath, aceMode, currentAction, projectId) {
     this.configureAceEditor(aceMode, assetsPath);
     this.initModePanesAndLinks();
     this.initSoftWrap();
-    this.initFileSelectors(currentAction);
+    this.initFileSelectors(currentAction, projectId);
   }
 
   configureAceEditor(aceMode, assetsPath) {
@@ -30,10 +30,11 @@ export default class EditBlob {
     }
   }
 
-  initFileSelectors(currentAction) {
+  initFileSelectors(currentAction, projectId) {
     this.fileTemplateMediator = new TemplateSelectorMediator({
       currentAction,
       editor: this.editor,
+      projectId,
     });
   }
 
@@ -60,7 +61,8 @@ export default class EditBlob {
 
     if (paneId === '#preview') {
       this.$toggleButton.hide();
-      axios.post(currentLink.data('previewUrl'), {
+      axios
+        .post(currentLink.data('previewUrl'), {
           content: this.editor.getValue(),
         })
         .then(({ data }) => {

app/assets/javascripts/ide/stores/modules/file_templates/actions.js

@@ -23,12 +23,12 @@ export const receiveTemplateTypesError = ({ commit, dispatch }) => {
 export const receiveTemplateTypesSuccess = ({ commit }, templates) =>
   commit(types.RECEIVE_TEMPLATE_TYPES_SUCCESS, templates);
 
-export const fetchTemplateTypes = ({ dispatch, state }, page = 1) => {
+export const fetchTemplateTypes = ({ dispatch, state, rootState }, page = 1) => {
   if (!Object.keys(state.selectedTemplateType).length) return Promise.reject();
 
   dispatch('requestTemplateTypes');
 
-  return Api.templates(state.selectedTemplateType.key, { page })
+  return Api.projectTemplates(rootState.currentProjectId, state.selectedTemplateType.key, { page })
     .then(({ data, headers }) => {
       const nextPage = parseInt(normalizeHeaders(headers)['X-NEXT-PAGE'], 10);
 
@@ -74,12 +74,16 @@ export const receiveTemplateError = ({ dispatch }, template) => {
   );
 };
 
-export const fetchTemplate = ({ dispatch, state }, template) => {
+export const fetchTemplate = ({ dispatch, state, rootState }, template) => {
   if (template.content) {
     return dispatch('setFileTemplate', template);
   }
 
-  return Api.templates(`${state.selectedTemplateType.key}/${template.key || template.name}`)
+  return Api.projectTemplate(
+    rootState.currentProjectId,
+    state.selectedTemplateType.key,
+    template.key || template.name,
+  )
     .then(({ data }) => {
       dispatch('setFileTemplate', data);
     })

app/finders/license_template_finder.rb

@@ -5,23 +5,38 @@
 # Used to find license templates, which may come from a variety of external
 # sources
 #
-# Arguments:
+# Params can be any of the following:
 #   popular: boolean. When set to true, only "popular" licenses are shown. When
 #            false, all licenses except popular ones are shown. When nil (the
 #            default), *all* licenses will be shown.
+#   name:    string. If set, return a single license matching that name (or nil)
 class LicenseTemplateFinder
+  include Gitlab::Utils::StrongMemoize
+
   prepend ::EE::LicenseTemplateFinder
 
-  attr_reader :params
+  attr_reader :project, :params
 
-  def initialize(params = {})
+  def initialize(project, params = {})
+    @project = project
     @params = params
   end
 
   def execute
+    if params[:name]
+      vendored_licenses.find { |template| template.key == params[:name] }
+    else
+      vendored_licenses
+    end
+  end
+
+  private
+
+  def vendored_licenses
+    strong_memoize(:vendored_licenses) do
       Licensee::License.all(featured: popular_only?).map do |license|
         LicenseTemplate.new(
-        id: license.key,
+          key: license.key,
           name: license.name,
           nickname: license.nickname,
           category: (license.featured? ? :Popular : :Other),
@@ -31,8 +46,7 @@ class LicenseTemplateFinder
         )
       end
     end
-
-  private
+  end
 
   def popular_only?
     params.fetch(:popular, nil)

app/finders/template_finder.rb

 # frozen_string_literal: true
 
 class TemplateFinder
+  include Gitlab::Utils::StrongMemoize
+
   prepend ::EE::TemplateFinder
 
-  VENDORED_TEMPLATES = {
+  VENDORED_TEMPLATES = HashWithIndifferentAccess.new(
     dockerfiles: ::Gitlab::Template::DockerfileTemplate,
     gitignores: ::Gitlab::Template::GitignoreTemplate,
     gitlab_ci_ymls: ::Gitlab::Template::GitlabCiYmlTemplate
-  }.freeze
+  ).freeze
 
   class << self
-    def build(type, params = {})
-      if type == :licenses
-        LicenseTemplateFinder.new(params) # rubocop: disable CodeReuse/Finder
+    def build(type, project, params = {})
+      if type.to_s == 'licenses'
+        LicenseTemplateFinder.new(project, params) # rubocop: disable CodeReuse/Finder
       else
-        new(type, params)
+        new(type, project, params)
       end
     end
   end
 
-  attr_reader :type, :params
+  attr_reader :type, :project, :params
 
   attr_reader :vendored_templates
   private :vendored_templates
 
-  def initialize(type, params = {})
+  def initialize(type, project, params = {})
     @type = type
+    @project = project
     @params = params
 
     @vendored_templates = VENDORED_TEMPLATES.fetch(type)

app/helpers/blob_helper.rb

@@ -159,10 +159,6 @@ module BlobHelper
     end
   end
 
-  def licenses_for_select
-    @licenses_for_select ||= template_dropdown_names(TemplateFinder.build(:licenses).execute)
-  end
-
   def ref_project
     @ref_project ||= @target_project || @project
   end
@@ -173,29 +169,34 @@ module BlobHelper
 
     categories.each_with_object({}) do |category, hash|
       hash[category] = grouped[category].map do |item|
-        { name: item.name, id: item.id }
+        { name: item.name, id: item.key }
       end
     end
   end
   private :template_dropdown_names
 
-  def gitignore_names
-    @gitignore_names ||= template_dropdown_names(TemplateFinder.build(:gitignores).execute)
+  def licenses_for_select(project = @project)
+    @licenses_for_select ||= template_dropdown_names(TemplateFinder.build(:licenses, project).execute)
+  end
+
+  def gitignore_names(project = @project)
+    @gitignore_names ||= template_dropdown_names(TemplateFinder.build(:gitignores, project).execute)
   end
 
-  def gitlab_ci_ymls
-    @gitlab_ci_ymls ||= template_dropdown_names(TemplateFinder.build(:gitlab_ci_ymls).execute)
+  def gitlab_ci_ymls(project = @project)
+    @gitlab_ci_ymls ||= template_dropdown_names(TemplateFinder.build(:gitlab_ci_ymls, project).execute)
   end
 
-  def dockerfile_names
-    @dockerfile_names ||= template_dropdown_names(TemplateFinder.build(:dockerfiles).execute)
+  def dockerfile_names(project = @project)
+    @dockerfile_names ||= template_dropdown_names(TemplateFinder.build(:dockerfiles, project).execute)
   end
 
-  def blob_editor_paths
+  def blob_editor_paths(project = @project)
     {
       'relative-url-root' => Rails.application.config.relative_url_root,
       'assets-prefix' => Gitlab::Application.config.assets.prefix,
-      'blob-language' => @blob && @blob.language.try(:ace_mode)
+      'blob-language' => @blob && @blob.language.try(:ace_mode),
+      'project-id' => project.id
     }
   end
 

app/models/license_template.rb

@@ -12,12 +12,10 @@ class LicenseTemplate
       (fullname|name\sof\s(author|copyright\sowner))
     [\>\}\]]}xi.freeze
 
-  attr_reader :id, :name, :category, :nickname, :url, :meta
+  attr_reader :key, :name, :category, :nickname, :url, :meta
 
-  alias_method :key, :id
-
-  def initialize(id:, name:, category:, content:, nickname: nil, url: nil, meta: {})
-    @id = id
+  def initialize(key:, name:, category:, content:, nickname: nil, url: nil, meta: {})
+    @key = key
     @name = name
     @category = category
     @content = content

changelogs/unreleased/5987-project-templates-api.yml

+---
+title: Allow file templates to be requested at the project level
+merge_request: 7776
+author:
+type: added

doc/api/README.md

@@ -20,13 +20,14 @@ following locations:
 - [Custom Attributes](custom_attributes.md)
 - [Deployments](deployments.md)
 - [Deploy Keys](deploy_keys.md)
+- [Dockerfile templates](templates/dockerfiles.md)
 - [Environments](environments.md)
 - [Epics](epics.md) **[ULTIMATE]**
 - [Epic Issues](epic_issues.md) **[ULTIMATE]**
 - [Events](events.md)
 - [Feature flags](features.md)
 - [Geo Nodes](geo_nodes.md) **[PREMIUM]**
-- [Gitignores templates](templates/gitignores.md)
+- [Gitignore templates](templates/gitignores.md)
 - [GitLab CI Config templates](templates/gitlab_ci_ymls.md)
 - [Groups](groups.md)
 - [Group Access Requests](access_requests.md)
@@ -62,6 +63,7 @@ following locations:
 - [Project import/export](project_import_export.md)
 - [Project Members](members.md)
 - [Project Snippets](project_snippets.md)
+- [Project Templates](project_templates.md)
 - [Protected Branches](protected_branches.md)
 - [Protected Tags](protected_tags.md)
 - [Repositories](repositories.md)

doc/api/project_templates.md

+# Project templates API
+
+This API is a project-specific implementation of these endpoints:
+
+- [Dockerfile templates](templates/dockerfiles.md)
+- [Gitignore templates](templates/gitignores.md)
+- [GitLab CI Config templates](templates/gitlab_ci_ymls.md)
+- [Open source license templates](templates/licenses.md)
+
+It deprecates those endpoints, which will be removed for API version 5.
+
+Project-specific templates will be added to this API in time. This includes, but
+is not limited to:
+
+- [Issue and Merge Request templates](../user/project/description_templates.html)
+- [Group level file templates](https://gitlab.com/gitlab-org/gitlab-ee/issues/5987) **(Premium)**
+
+## Get all templates of a particular type
+
+```
+GET /projects/:id/templates/:type
+```
+
+| Attribute  | Type   | Required | Description |
+| ---------- | ------ | -------- | ----------- |
+| `id `      | integer / string | yes      | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) |
+| `type`     | string | yes| The type `(dockerfiles|gitignores|gitlab_ci_ymls|licenses)` of the template |
+
+Example response (licenses):
+
+```json
+[
+  {
+    "key": "epl-1.0",
+    "name": "Eclipse Public License 1.0"
+  },
+  {
+    "key": "lgpl-3.0",
+    "name": "GNU Lesser General Public License v3.0"
+  },
+  {
+    "key": "unlicense",
+    "name": "The Unlicense"
+  },
+  {
+    "key": "agpl-3.0",
+    "name": "GNU Affero General Public License v3.0"
+  },
+  {
+    "key": "gpl-3.0",
+    "name": "GNU General Public License v3.0"
+  },
+  {
+    "key": "bsd-3-clause",
+    "name": "BSD 3-clause \"New\" or \"Revised\" License"
+  },
+  {
+    "key": "lgpl-2.1",
+    "name": "GNU Lesser General Public License v2.1"
+  },
+  {
+    "key": "mit",
+    "name": "MIT License"
+  },
+  {
+    "key": "apache-2.0",
+    "name": "Apache License 2.0"
+  },
+  {
+    "key": "bsd-2-clause",
+    "name": "BSD 2-clause \"Simplified\" License"
+  },
+  {
+    "key": "mpl-2.0",
+    "name": "Mozilla Public License 2.0"
+  },
+  {
+    "key": "gpl-2.0",
+    "name": "GNU General Public License v2.0"
+  }
+]
+```
+
+## Get one template of a particular type
+
+```
+GET /projects/:id/templates/:type/:key
+```
+
+| Attribute  | Type   | Required | Description |
+| ---------- | ------ | -------- | ----------- |
+| `id `      | integer / string | yes      | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) |
+| `type`     | string | yes| The type `(dockerfiles|gitignores|gitlab_ci_ymls|licenses)` of the template |
+| `key`      | string | yes      | The key of the template, as obtained from the collection endpoint |
+| `project`  | string | no       | The project name to use when expanding placeholders in the template. Only affects licenses |
+| `fullname` | string | no       | The full name of the copyright holder to use when expanding placeholders in the template. Only affects licenses |
+
+Example response (Dockerfile):
+
+
+```json
+{
+  "name": "Binary",
+  "content": "# This file is a template, and might need editing before it works on your project.\n# This Dockerfile installs a compiled binary into a bare system.\n# You must either commit your compiled binary into source control (not recommended)\n# or build the binary first as part of a CI/CD pipeline.\n\nFROM buildpack-deps:jessie\n\nWORKDIR /usr/local/bin\n\n# Change `app` to whatever your binary is called\nAdd app .\nCMD [\"./app\"]\n"
+}
+
+```
+
+Example response (license):
+
+```json
+{
+  "key": "mit",
+  "name": "MIT License",
+  "nickname": null,
+  "popular": true,
+  "html_url": "http://choosealicense.com/licenses/mit/",
+  "source_url": "https://opensource.org/licenses/MIT",
+  "description": "A short and simple permissive license with conditions only requiring preservation of copyright and license notices. Licensed works, modifications, and larger works may be distributed under different terms and without source code.",
+  "conditions": [
+    "include-copyright"
+  ],
+  "permissions": [
+    "commercial-use",
+    "modifications",
+    "distribution",
+    "private-use"
+  ],
+  "limitations": [
+    "liability",
+    "warranty"
+  ],
+  "content": "MIT License\n\nCopyright (c) 2018 [fullname]\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
+}
+```

doc/api/templates/dockerfiles.md

+# Dockerfiles API
+
+## List Dockerfile templates
+
+Get all Dockerfile templates.
+
+```
+GET /templates/dockerfiles
+```
+
+```bash
+curl https://gitlab.example.com/api/v4/templates/dockerfiles
+```
+
+Example response:
+
+```json
+[
+  {
+    "key": "Binary",
+    "name": "Binary"
+  },
+  {
+    "key": "Binary-alpine",
+    "name": "Binary-alpine"
+  },
+  {
+    "key": "Binary-scratch",
+    "name": "Binary-scratch"
+  },
+  {
+    "key": "Golang",
+    "name": "Golang"
+  },
+  {
+    "key": "Golang-alpine",
+    "name": "Golang-alpine"
+  },
+  {
+    "key": "Golang-scratch",
+    "name": "Golang-scratch"
+  },
+  {
+    "key": "HTTPd",
+    "name": "HTTPd"
+  },
+  {
+    "key": "Node",
+    "name": "Node"
+  },
+  {
+    "key": "Node-alpine",
+    "name": "Node-alpine"
+  },
+  {
+    "key": "OpenJDK",
+    "name": "OpenJDK"
+  },
+  {
+    "key": "OpenJDK-alpine",
+    "name": "OpenJDK-alpine"
+  },
+  {
+    "key": "PHP",
+    "name": "PHP"
+  },
+  {
+    "key": "Python",
+    "name": "Python"
+  },
+  {
+    "key": "Python-alpine",
+    "name": "Python-alpine"
+  },
+  {
+    "key": "Python2",
+    "name": "Python2"
+  },
+  {
+    "key": "Ruby",
+    "name": "Ruby"
+  },
+  {
+    "key": "Ruby-alpine",
+    "name": "Ruby-alpine"
+  }
+]
+```
+
+## Single Dockerfile template
+
+Get a single Dockerfile template.
+
+```
+GET /templates/dockerfiles/:key
+```
+
+| Attribute  | Type   | Required | Description |
+| ---------- | ------ | -------- | ----------- |
+| `key`      | string | yes      | The key of the Dockerfile template |
+
+```bash
+curl https://gitlab.example.com/api/v4/templates/dockerfiles/Binary
+```
+
+Example response:
+
+```json
+{
+  "name": "Binary",
+  "content": "# This file is a template, and might need editing before it works on your project.\n# This Dockerfile installs a compiled binary into a bare system.\n# You must either commit your compiled binary into source control (not recommended)\n# or build the binary first as part of a CI/CD pipeline.\n\nFROM buildpack-deps:jessie\n\nWORKDIR /usr/local/bin\n\n# Change `app` to whatever your binary is called\nAdd app .\nCMD [\"./app\"]\n"
+}
+```

doc/api/templates/gitignores.md

@@ -17,538 +17,84 @@ Example response:
 ```json
 [
   {
-    "name": "AppEngine"
-  },
-  {
-    "name": "Laravel"
-  },
-  {
-    "name": "Elisp"
-  },
-  {
-    "name": "SketchUp"
+    "key": "Actionscript",
+    "name": "Actionscript"
   },
   {
+    "key": "Ada",
     "name": "Ada"
   },
   {
-    "name": "Ruby"
-  },
-  {
-    "name": "Kohana"
-  },
-  {
-    "name": "Nanoc"
-  },
-  {
-    "name": "Erlang"
-  },
-  {
-    "name": "OCaml"
-  },
-  {
-    "name": "Lithium"
-  },
-  {
-    "name": "Fortran"
-  },
-  {
-    "name": "Scala"
-  },
-  {
-    "name": "Node"
-  },
-  {
-    "name": "Fancy"
-  },
-  {
-    "name": "Perl"
-  },
-  {
-    "name": "Zephir"
-  },
-  {
-    "name": "WordPress"
-  },
-  {
-    "name": "Symfony"
-  },
-  {
-    "name": "FuelPHP"
-  },
-  {
-    "name": "DM"
-  },
-  {
-    "name": "Sdcc"
-  },
-  {
-    "name": "Rust"
-  },
-  {
-    "name": "C"
-  },
-  {
-    "name": "Umbraco"
-  },
-  {
-    "name": "Actionscript"
+    "key": "Agda",
+    "name": "Agda"
   },
   {
+    "key": "Android",
     "name": "Android"
   },
   {
-    "name": "Grails"
-  },
-  {
-    "name": "Composer"
-  },
-  {
-    "name": "ExpressionEngine"
-  },
-  {
-    "name": "Gcov"
-  },
-  {
-    "name": "Qt"
+    "key": "AppEngine",
+    "name": "AppEngine"
   },
   {
-    "name": "Phalcon"
+    "key": "AppceleratorTitanium",
+    "name": "AppceleratorTitanium"
   },
   {
+    "key": "ArchLinuxPackages",
     "name": "ArchLinuxPackages"
   },
   {
-    "name": "TeX"
-  },
-  {
-    "name": "SCons"
-  },
-  {
-    "name": "Lilypond"
-  },
-  {
-    "name": "CommonLisp"
-  },
-  {
-    "name": "Rails"
-  },
-  {
-    "name": "Mercury"
-  },
-  {
-    "name": "Magento"
-  },
-  {
-    "name": "ChefCookbook"
-  },
-  {
-    "name": "GitBook"
-  },
-  {
-    "name": "C++"
-  },
-  {
-    "name": "Eagle"
-  },
-  {
-    "name": "Go"
-  },
-  {
-    "name": "OpenCart"
-  },
-  {
-    "name": "Scheme"
-  },
-  {
-    "name": "Typo3"
-  },
-  {
-    "name": "SeamGen"
-  },
-  {
-    "name": "Swift"
-  },
-  {
-    "name": "Elm"
-  },
-  {
-    "name": "Unity"
-  },
-  {
-    "name": "Agda"
-  },
-  {
-    "name": "CUDA"
-  },
-  {
-    "name": "VVVV"
-  },
-  {
-    "name": "Finale"
-  },
-  {
-    "name": "LemonStand"
-  },
-  {
-    "name": "Textpattern"
-  },
-  {
-    "name": "Julia"
-  },
-  {
-    "name": "Packer"
-  },
-  {
-    "name": "Scrivener"
-  },
-  {
-    "name": "Dart"
-  },
-  {
-    "name": "Plone"
-  },
-  {
-    "name": "Jekyll"
-  },
-  {
-    "name": "Xojo"
-  },
-  {
-    "name": "LabVIEW"
-  },
-  {
+    "key": "Autotools",
     "name": "Autotools"
   },
   {
-    "name": "KiCad"
-  },
-  {
-    "name": "Prestashop"
-  },
-  {
-    "name": "ROS"
-  },
-  {
-    "name": "Smalltalk"
-  },
-  {
-    "name": "GWT"
-  },
-  {
-    "name": "OracleForms"
-  },
-  {
-    "name": "SugarCRM"
-  },
-  {
-    "name": "Nim"
-  },
-  {
-    "name": "SymphonyCMS"
+    "key": "C",
+    "name": "C"
   },
   {
-    "name": "Maven"
+    "key": "C++",
+    "name": "C++"
   },
   {
+    "key": "CFWheels",
     "name": "CFWheels"
   },
   {
-    "name": "Python"
-  },
-  {
-    "name": "ZendFramework"
-  },
-  {
-    "name": "CakePHP"
-  },
-  {
-    "name": "Concrete5"
-  },
-  {
-    "name": "PlayFramework"
-  },
-  {
-    "name": "Terraform"
-  },
-  {
-    "name": "Elixir"
-  },
-  {
+    "key": "CMake",
     "name": "CMake"
   },
   {
-    "name": "Joomla"
-  },
-  {
-    "name": "Coq"
-  },
-  {
-    "name": "Delphi"
-  },
-  {
-    "name": "Haskell"
-  },
-  {
-    "name": "Yii"
-  },
-  {
-    "name": "Java"
-  },
-  {
-    "name": "UnrealEngine"
-  },
-  {
-    "name": "AppceleratorTitanium"
-  },
-  {
-    "name": "CraftCMS"
-  },
-  {
-    "name": "ForceDotCom"
-  },
-  {
-    "name": "ExtJs"
-  },
-  {
-    "name": "MetaProgrammingSystem"
-  },
-  {
-    "name": "D"
-  },
-  {
-    "name": "Objective-C"
-  },
-  {
-    "name": "RhodesRhomobile"
-  },
-  {
-    "name": "R"
-  },
-  {
-    "name": "EPiServer"
-  },
-  {
-    "name": "Yeoman"
-  },
-  {
-    "name": "VisualStudio"
-  },
-  {
-    "name": "Processing"
-  },
-  {
-    "name": "Leiningen"
-  },
-  {
-    "name": "Stella"
-  },
-  {
-    "name": "Opa"
-  },
-  {
-    "name": "Drupal"
-  },
-  {
-    "name": "TurboGears2"
-  },
-  {
-    "name": "Idris"
-  },
-  {
-    "name": "Jboss"
-  },
-  {
-    "name": "CodeIgniter"
-  },
-  {
-    "name": "Qooxdoo"
-  },
-  {
-    "name": "Waf"
+    "key": "CUDA",
+    "name": "CUDA"
   },
   {
-    "name": "Sass"
+    "key": "CakePHP",
+    "name": "CakePHP"
   },
   {
-    "name": "Lua"
+    "key": "ChefCookbook",
+    "name": "ChefCookbook"
   },
   {
+    "key": "Clojure",
     "name": "Clojure"
   },
   {
-    "name": "IGORPro"
-  },
-  {
-    "name": "Gradle"
-  },
-  {
-    "name": "Archives"
-  },
-  {
-    "name": "SynopsysVCS"
-  },
-  {
-    "name": "Ninja"
-  },
-  {
-    "name": "Tags"
-  },
-  {
-    "name": "OSX"
-  },
-  {
-    "name": "Dreamweaver"
-  },
-  {
-    "name": "CodeKit"
-  },
-  {
-    "name": "NotepadPP"
-  },
-  {
-    "name": "VisualStudioCode"
-  },
-  {
-    "name": "Mercurial"
-  },
-  {
-    "name": "BricxCC"
-  },
-  {
-    "name": "DartEditor"
-  },
-  {
-    "name": "Eclipse"
-  },
-  {
-    "name": "Cloud9"
-  },
-  {
-    "name": "TortoiseGit"
-  },
-  {
-    "name": "NetBeans"
-  },
-  {
-    "name": "GPG"
-  },
-  {
-    "name": "Espresso"
-  },
-  {
-    "name": "Redcar"
-  },
-  {
-    "name": "Xcode"
-  },
-  {
-    "name": "Matlab"
-  },
-  {
-    "name": "LyX"
-  },
-  {
-    "name": "SlickEdit"
-  },
-  {
-    "name": "Dropbox"
-  },
-  {
-    "name": "CVS"
-  },
-  {
-    "name": "Calabash"
-  },
-  {
-    "name": "JDeveloper"
-  },
-  {
-    "name": "Vagrant"
-  },
-  {
-    "name": "IPythonNotebook"
-  },
-  {
-    "name": "TextMate"
-  },
-  {
-    "name": "Ensime"
-  },
-  {
-    "name": "WebMethods"
-  },
-  {
-    "name": "VirtualEnv"
-  },
-  {
-    "name": "Emacs"
-  },
-  {
-    "name": "Momentics"
-  },
-  {
-    "name": "JetBrains"
-  },
-  {
-    "name": "SublimeText"
-  },
-  {
-    "name": "Kate"
-  },
-  {
-    "name": "ModelSim"
-  },
-  {
-    "name": "Redis"
-  },
-  {
-    "name": "KDevelop4"
-  },
-  {
-    "name": "Bazaar"
-  },
-  {
-    "name": "Linux"
-  },
-  {
-    "name": "Windows"
-  },
-  {
-    "name": "XilinxISE"
-  },
-  {
-    "name": "Lazarus"
-  },
-  {
-    "name": "EiffelStudio"
-  },
-  {
-    "name": "Anjuta"
-  },
-  {
-    "name": "Vim"
-  },
-  {
-    "name": "Otto"
-  },
-  {
-    "name": "MicrosoftOffice"
-  },
-  {
-    "name": "LibreOffice"
-  },
-  {
-    "name": "SBT"
+    "key": "CodeIgniter",
+    "name": "CodeIgniter"
   },
   {
-    "name": "MonoDevelop"
+    "key": "CommonLisp",
+    "name": "CommonLisp"
   },
   {
-    "name": "SVN"
+    "key": "Composer",
+    "name": "Composer"
   },
   {
-    "name": "FlexBuilder"
+    "key": "Concrete5",
+    "name": "Concrete5"
   }
 ]
 ```

doc/api/templates/gitlab_ci_ymls.md

@@ -17,79 +17,84 @@ Example response:
 ```json
 [
   {
-    "name": "C++"
-  },
-  {
-    "name": "Docker"
-  },
-  {
-    "name": "Elixir"
-  },
-  {
-    "name": "LaTeX"
-  },
-  {
-    "name": "Grails"
-  },
-  {
-    "name": "Rust"
+    "key": "Android",
+    "name": "Android"
   },
   {
-    "name": "Nodejs"
+    "key": "Auto-DevOps",
+    "name": "Auto-DevOps"
   },
   {
-    "name": "Ruby"
+    "key": "Bash",
+    "name": "Bash"
   },
   {
-    "name": "Scala"
+    "key": "C++",
+    "name": "C++"
   },
   {
-    "name": "Maven"
+    "key": "Chef",
+    "name": "Chef"
   },
   {
-    "name": "Harp"
+    "key": "Clojure",
+    "name": "Clojure"
   },
   {
-    "name": "Pelican"
+    "key": "Crystal",
+    "name": "Crystal"
   },
   {
-    "name": "Hyde"
+    "key": "Django",
+    "name": "Django"
   },
   {
-    "name": "Nanoc"
+    "key": "Docker",
+    "name": "Docker"
   },
   {
-    "name": "Octopress"
+    "key": "Elixir",
+    "name": "Elixir"
   },
   {
-    "name": "JBake"
+    "key": "Go",
+    "name": "Go"
   },
   {
-    "name": "HTML"
+    "key": "Gradle",
+    "name": "Gradle"
   },
   {
-    "name": "Hugo"
+    "key": "Grails",
+    "name": "Grails"
   },
   {
-    "name": "Metalsmith"
+    "key": "Julia",
+    "name": "Julia"
   },
   {
-    "name": "Hexo"
+    "key": "LaTeX",
+    "name": "LaTeX"
   },
   {
-    "name": "Lektor"
+    "key": "Laravel",
+    "name": "Laravel"
   },
   {
-    "name": "Doxygen"
+    "key": "Maven",
+    "name": "Maven"
   },
   {
-    "name": "Brunch"
+    "key": "Mono",
+    "name": "Mono"
   },
   {
-    "name": "Jekyll"
+    "key": "Nodejs",
+    "name": "Nodejs"
   },
   {
-    "name": "Middleman"
+    "key": "OpenShift",
+    "name": "OpenShift"
   }
 ]
 ```

ee/app/finders/ee/license_template_finder.rb

 module EE
   module LicenseTemplateFinder
-    include ::Gitlab::Utils::StrongMemoize
     extend ::Gitlab::Utils::Override
 
     override :execute
     def execute
       return super unless custom_templates?
 
-      extra = custom_licenses.map do |template|
-        LicenseTemplate.new(
-          id: template.name,
-          name: template.name,
-          nickname: template.name,
-          category: :Custom,
-          content: -> { template.content }
-        )
+      if params[:name]
+        custom_template || super
+      else
+        custom_templates + super
       end
-
-      extra.push(*super)
     end
 
     private
 
+    def custom_templates
+      templates_for(template_project).map do |template|
+        translate(template, category: :Custom)
+      end
+    end
+
+    def custom_template
+      template = template_for(template_project, params[:name])
+
+      translate(template, category: :Custom)
+    rescue ::Gitlab::Template::Finders::RepoTemplateFinder::FileNotFoundError
+      nil
+    end
+
     def custom_templates?
       !popular_only? &&
         ::License.feature_available?(:custom_file_templates) &&
         template_project.present?
     end
 
-    def custom_licenses
-      ::Gitlab::Template::CustomLicenseTemplate.all(template_project)
-    end
-
     def template_project
       strong_memoize(:template_project) { ::Gitlab::CurrentSettings.file_template_project }
     end
+
+    def templates_for(project)
+      return [] unless project
+
+      ::Gitlab::Template::CustomLicenseTemplate.all(project)
+    end
+
+    def template_for(project, name)
+      return unless project
+
+      ::Gitlab::Template::CustomLicenseTemplate.find(name, project)
+    end
+
+    def translate(template, category:)
+      return unless template
+
+      LicenseTemplate.new(
+        key: template.key,
+        name: template.name,
+        nickname: template.name,
+        category: category,
+        content: -> { template.content }
+      )
+    end
   end
 end

ee/app/finders/ee/template_finder.rb

 module EE
   module TemplateFinder
-    include ::Gitlab::Utils::StrongMemoize
     extend ::Gitlab::Utils::Override
 
-    CUSTOM_TEMPLATES = {
+    CUSTOM_TEMPLATES = HashWithIndifferentAccess.new(
       dockerfiles: ::Gitlab::Template::CustomDockerfileTemplate,
       gitignores: ::Gitlab::Template::CustomGitignoreTemplate,
       gitlab_ci_ymls: ::Gitlab::Template::CustomGitlabCiYmlTemplate
-    }.freeze
+    ).freeze
 
     attr_reader :custom_templates
     private :custom_templates

ee/spec/finders/license_template_finder_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe LicenseTemplateFinder do
   describe '#execute' do
-    subject(:result) { described_class.new(params).execute }
+    subject(:result) { described_class.new(nil, params).execute }
 
     let(:params) { {} }
 

ee/spec/finders/template_finder_spec.rb

@@ -24,7 +24,7 @@ describe TemplateFinder do
     end
 
     with_them do
-      subject(:result) { described_class.new(type, params).execute }
+      subject(:result) { described_class.new(type, nil, params).execute }
 
       context 'specifying name' do
         let(:params) { { name: custom_name } }

ee/spec/helpers/ee/blob_helper_spec.rb

@@ -20,10 +20,10 @@ describe BlobHelper do
       expect(Gitlab::Template::CustomLicenseTemplate)
         .to receive(:all)
         .with(project)
-        .and_return([OpenStruct.new(name: "name")])
+        .and_return([OpenStruct.new(key: 'name', name: 'Name')])
 
       expect(categories).to contain_exactly(:Popular, :Other, :Custom)
-      expect(custom).to contain_exactly({ name: "name", id: "name" })
+      expect(custom).to contain_exactly({ id: 'name', name: 'Name' })
       expect(popular).to be_present
       expect(other).to be_present
     end

lib/api/api.rb

@@ -142,6 +142,7 @@ module API
     mount ::API::Projects
     mount ::API::ProjectSnapshots
     mount ::API::ProjectSnippets
+    mount ::API::ProjectTemplates
     mount ::API::ProtectedBranches
     mount ::API::ProtectedTags
     mount ::API::Repositories

lib/api/entities.rb

@@ -1249,6 +1249,7 @@ module API
     end
 
     class TemplatesList < Grape::Entity
+      expose :key
       expose :name
     end
 

lib/api/project_templates.rb

+# frozen_string_literal: true
+
+module API
+  class ProjectTemplates < Grape::API
+    include PaginationParams
+
+    TEMPLATE_TYPES = %w[dockerfiles gitignores gitlab_ci_ymls licenses].freeze
+
+    before { authenticate_non_get! }
+
+    params do
+      requires :id, type: String, desc: 'The ID of a project'
+      requires :type, type: String, values: TEMPLATE_TYPES, desc: 'The type (dockerfiles|gitignores|gitlab_ci_ymls|licenses) of the template'
+    end
+    resource :projects do
+      desc 'Get a list of templates available to this project' do
+        detail 'This endpoint was introduced in GitLab 11.4'
+      end
+      params do
+        use :pagination
+      end
+      get ':id/templates/:type' do
+        templates = TemplateFinder
+          .build(params[:type], user_project)
+          .execute
+
+        present paginate(::Kaminari.paginate_array(templates)), with: Entities::TemplatesList
+      end
+
+      desc 'Download a template available to this project' do
+        detail 'This endpoint was introduced in GitLab 11.4'
+      end
+      params do
+        requires :name, type: String, desc: 'The name of the template'
+
+        optional :project, type: String, desc: 'The project name to use when expanding placeholders in the template. Only affects licenses'
+        optional :fullname, type: String, desc: 'The full name of the copyright holder to use when expanding placeholders in the template. Only affects licenses'
+      end
+      get ':id/templates/:type/:name', requirements: { name: /[\w\.-]+/ } do
+        template = TemplateFinder
+          .build(params[:type], user_project, name: params[:name])
+          .execute
+
+        not_found!('Template') unless template.present?
+
+        template.resolve!(
+          project_name: params[:project].presence,
+          fullname: params[:fullname].presence || current_user&.name
+        )
+
+        if template.is_a?(::LicenseTemplate)
+          present template, with: Entities::License
+        else
+          present template, with: Entities::Template
+        end
+      end
+    end
+  end
+end

lib/api/templates.rb

@@ -35,7 +35,7 @@ module API
       popular = declared(params)[:popular]
       popular = to_boolean(popular) if popular.present?
 
-      templates = TemplateFinder.build(:licenses, popular: popular).execute
+      templates = TemplateFinder.build(:licenses, nil, popular: popular).execute
 
       present paginate(::Kaminari.paginate_array(templates)), with: ::API::Entities::License
     end
@@ -48,8 +48,7 @@ module API
       requires :name, type: String, desc: 'The name of the template'
     end
     get "templates/licenses/:name", requirements: { name: /[\w\.-]+/ } do
-      templates = TemplateFinder.build(:licenses).execute
-      template = templates.find { |template| template.key == params[:name] }
+      template = TemplateFinder.build(:licenses, nil, name: params[:name]).execute
 
       not_found!('License') unless template.present?
 
@@ -72,7 +71,7 @@ module API
         use :pagination
       end
       get "templates/#{template_type}" do
-        templates = ::Kaminari.paginate_array(TemplateFinder.new(template_type).execute)
+        templates = ::Kaminari.paginate_array(TemplateFinder.build(template_type, nil).execute)
         present paginate(templates), with: Entities::TemplatesList
       end
 
@@ -84,7 +83,7 @@ module API
         requires :name, type: String, desc: 'The name of the template'
       end
       get "templates/#{template_type}/:name" do
-        finder = TemplateFinder.build(template_type, name: declared(params)[:name])
+        finder = TemplateFinder.build(template_type, nil, name: declared(params)[:name])
         new_template = finder.execute
 
         render_response(template_type, new_template)

lib/gitlab/template/base_template.rb

@@ -12,14 +12,21 @@ module Gitlab
       def name
         File.basename(@path, self.class.extension)
       end
-      alias_method :id, :name
+      alias_method :key, :name
 
       def content
         @finder.read(@path)
       end
 
+      # Present for compatibility with license templates, which can replace text
+      # like `[fullname]` with a user-specified string. This is a no-op for
+      # other templates
+      def resolve!(_placeholders = {})
+        self
+      end
+
       def to_json
-        { name: name, content: content }
+        { key: key, name: name, content: content }
       end
 
       def <=>(other)

spec/finders/license_template_finder_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe LicenseTemplateFinder do
   describe '#execute' do
-    subject(:result) { described_class.new(params).execute }
+    subject(:result) { described_class.new(nil, params).execute }
 
     let(:categories) { categorised_licenses.keys }
     let(:categorised_licenses) { result.group_by(&:category) }
@@ -31,7 +31,7 @@ describe LicenseTemplateFinder do
       it 'returns all licenses known by the Licensee gem' do
         from_licensee = Licensee::License.all.map { |l| l.key }
 
-        expect(result.map(&:id)).to match_array(from_licensee)
+        expect(result.map(&:key)).to match_array(from_licensee)
       end
 
       it 'correctly copies all attributes' do

spec/finders/template_finder_spec.rb

@@ -4,6 +4,8 @@ describe TemplateFinder do
   using RSpec::Parameterized::TableSyntax
 
   describe '#build' do
+    let(:project) { build_stubbed(:project) }
+
     where(:type, :expected_class) do
       :dockerfiles    | described_class
       :gitignores     | described_class
@@ -12,9 +14,10 @@ describe TemplateFinder do
     end
 
     with_them do
-      subject { described_class.build(type) }
+      subject(:finder) { described_class.build(type, project) }
 
       it { is_expected.to be_a(expected_class) }
+      it { expect(finder.project).to eq(project) }
     end
   end
 
@@ -27,19 +30,19 @@ describe TemplateFinder do
 
     with_them do
       it 'returns all vendored templates when no name is specified' do
-        result = described_class.new(type).execute
+        result = described_class.new(type, nil).execute
 
         expect(result).to include(have_attributes(name: vendored_name))
       end
 
       it 'returns only the specified vendored template when a name is specified' do
-        result = described_class.new(type, name: vendored_name).execute
+        result = described_class.new(type, nil, name: vendored_name).execute
 
         expect(result).to have_attributes(name: vendored_name)
       end
 
       it 'returns nil when an unknown name is specified' do
-        result = described_class.new(type, name: 'unknown').execute
+        result = described_class.new(type, nil, name: 'unknown').execute
 
         expect(result).to be_nil
       end

spec/fixtures/api/schemas/public_api/v4/license.json

+{
+  "type": "object",
+  "required": [
+    "key",
+    "name",
+    "nickname",
+    "popular",
+    "html_url",
+    "source_url",
+    "description",
+    "conditions",
+    "permissions",
+    "limitations",
+    "content"
+  ],
+  "properties": {
+    "key": { "type": "string" },
+    "name": { "type": "string" },
+    "nickname": { "type": ["null", "string"] },
+    "popular": { "type": "boolean" },
+    "html_url": { "type": ["null", "string"] },
+    "source_url": { "type": ["null", "string"] },
+    "description": { "type": ["null", "string"] },
+    "conditions": { "type": "array", "items": { "type": "string" } },
+    "permissions": { "type": "array", "items": { "type": "string" } },
+    "limitations": { "type": "array", "items": { "type": "string" } },
+    "content": { "type": "string" }
+  },
+  "additionalProperties": false
+}

spec/fixtures/api/schemas/public_api/v4/template.json

+{
+  "type": "object",
+  "required": [
+    "name",
+    "content"
+  ],
+  "properties": {
+    "name": { "type": "string" },
+    "content": { "type": "string" }
+  },
+  "additionalProperties": false
+}

spec/fixtures/api/schemas/public_api/v4/template_list.json

+{
+  "type": "array",
+  "items": {
+    "type": "object",
+    "required": [
+      "key",
+      "name"
+    ],
+    "properties": {
+      "key": { "type": "string" },
+      "name": { "type": "string" }
+    },
+    "additionalProperties": false
+  }
+}

spec/javascripts/api_spec.js

@@ -250,71 +250,45 @@ describe('Api', () => {
     });
   });
 
-  describe('licenseText', () => {
-    it('fetches a license text', done => {
-      const licenseKey = "driver's license";
-      const data = { unused: 'option' };
-      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/templates/licenses/${licenseKey}`;
+  describe('issueTemplate', () => {
+    it('fetches an issue template', done => {
+      const namespace = 'some namespace';
+      const project = 'some project';
+      const templateKey = ' template #%?.key ';
+      const templateType = 'template type';
+      const expectedUrl = `${dummyUrlRoot}/${namespace}/${project}/templates/${templateType}/${encodeURIComponent(
+        templateKey,
+      )}`;
       mock.onGet(expectedUrl).reply(200, 'test');
 
-      Api.licenseText(licenseKey, data, response => {
+      Api.issueTemplate(namespace, project, templateKey, templateType, (error, response) => {
         expect(response).toBe('test');
         done();
       });
     });
   });
 
-  describe('gitignoreText', () => {
-    it('fetches a gitignore text', done => {
-      const gitignoreKey = 'ignore git';
-      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/templates/gitignores/${gitignoreKey}`;
-      mock.onGet(expectedUrl).reply(200, 'test');
-
-      Api.gitignoreText(gitignoreKey, response => {
-        expect(response).toBe('test');
-        done();
-      });
-    });
-  });
+  describe('projectTemplates', () => {
+    it('fetches a list of templates', done => {
+      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects/gitlab-org%2Fgitlab-ce/templates/licenses`;
 
-  describe('gitlabCiYml', () => {
-    it('fetches a .gitlab-ci.yml', done => {
-      const gitlabCiYmlKey = 'Y CI ML';
-      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/templates/gitlab_ci_ymls/${gitlabCiYmlKey}`;
       mock.onGet(expectedUrl).reply(200, 'test');
 
-      Api.gitlabCiYml(gitlabCiYmlKey, response => {
+      Api.projectTemplates('gitlab-org/gitlab-ce', 'licenses', {}, response => {
         expect(response).toBe('test');
         done();
       });
     });
   });
 
-  describe('dockerfileYml', () => {
-    it('fetches a Dockerfile', done => {
-      const dockerfileYmlKey = 'a giant whale';
-      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/templates/dockerfiles/${dockerfileYmlKey}`;
-      mock.onGet(expectedUrl).reply(200, 'test');
-
-      Api.dockerfileYml(dockerfileYmlKey, response => {
-        expect(response).toBe('test');
-        done();
-      });
-    });
-  });
+  describe('projectTemplate', () => {
+    it('fetches a single template', done => {
+      const data = { unused: 'option' };
+      const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects/gitlab-org%2Fgitlab-ce/templates/licenses/test%20license`;
 
-  describe('issueTemplate', () => {
-    it('fetches an issue template', done => {
-      const namespace = 'some namespace';
-      const project = 'some project';
-      const templateKey = ' template #%?.key ';
-      const templateType = 'template type';
-      const expectedUrl = `${dummyUrlRoot}/${namespace}/${project}/templates/${templateType}/${encodeURIComponent(
-        templateKey,
-      )}`;
       mock.onGet(expectedUrl).reply(200, 'test');
 
-      Api.issueTemplate(namespace, project, templateKey, templateType, (error, response) => {
+      Api.projectTemplate('gitlab-org/gitlab-ce', 'licenses', 'test license', data, response => {
         expect(response).toBe('test');
         done();
       });

spec/models/license_template_spec.rb

@@ -54,6 +54,6 @@ describe LicenseTemplate do
   end
 
   def build_template(content)
-    described_class.new(id: 'foo', name: 'foo', category: :Other, content: content)
+    described_class.new(key: 'foo', name: 'foo', category: :Other, content: content)
   end
 end

spec/requests/api/project_templates_spec.rb

+require 'spec_helper'
+
+describe API::ProjectTemplates do
+  let(:public_project) { create(:project, :public) }
+  let(:private_project) { create(:project, :private) }
+  let(:developer) { create(:user) }
+
+  before do
+    private_project.add_developer(developer)
+  end
+
+  describe 'GET /projects/:id/templates/:type' do
+    it 'returns dockerfiles' do
+      get api("/projects/#{public_project.id}/templates/dockerfiles")
+
+      expect(response).to have_gitlab_http_status(200)
+      expect(response).to include_pagination_headers
+      expect(response).to match_response_schema('public_api/v4/template_list')
+      expect(json_response).to satisfy_one { |template| template['key'] == 'Binary' }
+    end
+
+    it 'returns gitignores' do
+      get api("/projects/#{public_project.id}/templates/gitignores")
+
+      expect(response).to have_gitlab_http_status(200)
+      expect(response).to include_pagination_headers
+      expect(response).to match_response_schema('public_api/v4/template_list')
+      expect(json_response).to satisfy_one { |template| template['key'] == 'Actionscript' }
+    end
+
+    it 'returns gitlab_ci_ymls' do
+      get api("/projects/#{public_project.id}/templates/gitlab_ci_ymls")
+
+      expect(response).to have_gitlab_http_status(200)
+      expect(response).to include_pagination_headers
+      expect(response).to match_response_schema('public_api/v4/template_list')
+      expect(json_response).to satisfy_one { |template| template['key'] == 'Android' }
+    end
+
+    it 'returns licenses' do
+      get api("/projects/#{public_project.id}/templates/licenses")
+
+      expect(response).to have_gitlab_http_status(200)
+      expect(response).to include_pagination_headers
+      expect(response).to match_response_schema('public_api/v4/template_list')
+      expect(json_response).to satisfy_one { |template| template['key'] == 'mit' }
+    end
+
+    it 'returns 400 for an unknown template type' do
+      get api("/projects/#{public_project.id}/templates/unknown")
+
+      expect(response).to have_gitlab_http_status(400)
+    end
+
+    it 'denies access to an anonymous user on a private project' do
+      get api("/projects/#{private_project.id}/templates/licenses")
+
+      expect(response).to have_gitlab_http_status(404)
+    end
+
+    it 'permits access to a developer on a private project' do
+      get api("/projects/#{private_project.id}/templates/licenses", developer)
+
+      expect(response).to have_gitlab_http_status(200)
+      expect(response).to match_response_schema('public_api/v4/template_list')
+    end
+  end
+
+  describe 'GET /projects/:id/templates/licenses' do
+    it 'returns key and name for the listed licenses' do
+      get api("/projects/#{public_project.id}/templates/licenses")
+
+      expect(response).to have_gitlab_http_status(200)
+      expect(response).to match_response_schema('public_api/v4/template_list')
+    end
+  end
+
+  describe 'GET /projects/:id/templates/:type/:key' do
+    it 'returns a specific dockerfile' do
+      get api("/projects/#{public_project.id}/templates/dockerfiles/Binary")
+
+      expect(response).to have_gitlab_http_status(200)
+      expect(response).to match_response_schema('public_api/v4/template')
+      expect(json_response['name']).to eq('Binary')
+    end
+
+    it 'returns a specific gitignore' do
+      get api("/projects/#{public_project.id}/templates/gitignores/Actionscript")
+
+      expect(response).to have_gitlab_http_status(200)
+      expect(response).to match_response_schema('public_api/v4/template')
+      expect(json_response['name']).to eq('Actionscript')
+    end
+
+    it 'returns a specific gitlab_ci_yml' do
+      get api("/projects/#{public_project.id}/templates/gitlab_ci_ymls/Android")
+
+      expect(response).to have_gitlab_http_status(200)
+      expect(response).to match_response_schema('public_api/v4/template')
+      expect(json_response['name']).to eq('Android')
+    end
+
+    it 'returns a specific license' do
+      get api("/projects/#{public_project.id}/templates/licenses/mit")
+
+      expect(response).to have_gitlab_http_status(200)
+      expect(response).to match_response_schema('public_api/v4/license')
+    end
+
+    it 'returns 404 for an unknown specific template' do
+      get api("/projects/#{public_project.id}/templates/licenses/unknown")
+
+      expect(response).to have_gitlab_http_status(404)
+    end
+
+    it 'denies access to an anonymous user on a private project' do
+      get api("/projects/#{private_project.id}/templates/licenses/mit")
+
+      expect(response).to have_gitlab_http_status(404)
+    end
+
+    it 'permits access to a developer on a private project' do
+      get api("/projects/#{private_project.id}/templates/licenses/mit", developer)
+
+      expect(response).to have_gitlab_http_status(200)
+      expect(response).to match_response_schema('public_api/v4/license')
+    end
+  end
+
+  describe 'GET /projects/:id/templates/licenses/:key' do
+    it 'fills placeholders in the license' do
+      get api("/projects/#{public_project.id}/templates/licenses/agpl-3.0"),
+          project: 'Project Placeholder',
+          fullname: 'Fullname Placeholder'
+
+      expect(response).to have_gitlab_http_status(200)
+      expect(response).to match_response_schema('public_api/v4/license')
+
+      content = json_response['content']
+
+      expect(content).to include('Project Placeholder')
+      expect(content).to include("Copyright (C) #{Time.now.year}  Fullname Placeholder")
+    end
+  end
+end