Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
GitLab
GitLab
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 23,566
    • Issues 23,566
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 821
    • Merge Requests 821
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Security & Compliance
    • Security & Compliance
    • Dependency List
  • Packages
    • Packages
    • Container Registry
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • GitLab.org
  • GitLabGitLab
  • Merge Requests
  • !6631

Merged
Opened Jul 23, 2018 by Daniel Barker@barkerd42711 of 16 tasks completed11/16 tasks
  • Report abuse
Report abuse

Add instance-level license template

What does this MR do?

This MR adds an instance-wide template project, and implements the first type of instance-wide templates. The templates are license templates that allow an organization to provide standard organizational licenses for all developers to use in their company projects.

Are there points in the code the reviewer needs to double check?

This is our first contribution, so likely everything.

Why was this MR needed?

This MR closes issue #5986 (closed), and discussions of why this is needed exist there.

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

  • Changelog entry added, if necessary
  • Documentation created/updated
  • API support added
  • Tests added for this feature/bug
  • Conforms to the code review guidelines
    • Has been reviewed by a UX Designer
    • Has been reviewed by a Frontend maintainer
    • Has been reviewed by a Backend maintainer
    • Has been reviewed by a Database specialist
  • EE specific content should be in the top level /ee folder
  • Conforms to the merge request performance guidelines
  • Conforms to the style guides
  • Conforms to the database guides
  • If you have multiple commits, please combine them into a few logically organized commits by squashing them
  • Internationalization required/considered
  • If paid feature, have we considered GitLab.com plan and how it works for groups and is there a design for promoting it to users who aren't on the correct plan
  • End-to-end tests pass (package-and-qa manual pipeline job)

What are the relevant issue numbers?

Edited Aug 14, 2018 by Nick Thomas

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://gitlab.com/devopskc/gitlab-ee.git" "license"
git checkout -b "devopskc/gitlab-ee-license" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "origin/master"
git merge --no-ff "devopskc/gitlab-ee-license"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 133
  • Commits 44
  • Pipelines 33
  • Changes 34
Assignee
Assign to
11.3
Milestone
11.3
Assign milestone
Time tracking
6
Labels
Community contribution Create [DEPRECATED] Enterprise Edition devops::create release post item repository
Assign labels
  • View project labels
Reference: gitlab-org/gitlab!6631

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.