Skip to content
GitLab
Next
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    Projects Groups Topics Snippets
  • Register
  • Sign in
  • release-tools release-tools
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 74
    • Issues 74
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
  • Merge requests 23
    • Merge requests 23
  • Deployments
    • Deployments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • Code review
    • Insights
    • Issue
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • GitLab.orgGitLab.org
  • release-toolsrelease-tools
  • Merge requests
  • !86

Add a new `upstream_merge` task

  • Review changes

  • Download
  • Email patches
  • Plain diff
Closed Rémy Coutable requested to merge rc/add-a-ce-to-ee-merge-task into master Jan 31, 2017
  • Overview 29
  • Commits 122
  • Pipelines 0
  • Changes 87

The goal is to have the task:

  1. Merge CE into EE
  2. Open a merge request
  3. (Optional) Ping the most relevant people by looking at the conflicting files' history
  4. Specs

Pre-requisites

  1. Add the ability to find/create a merge request: !139 (merged)
  2. Move remotes to the Project classes and get rid of the Remotes class: !168 (merged)
  3. Add head, status, log, fetch, checkout_new_branch, pull, push, and merge to RemoteRepository: !177 (merged)
  4. Introduce a new CommitAuthor class : !197 (merged)

Todo

  1. Allow to pass MENTION=true (default to false) to ping people in the MR description
Edited Nov 09, 2017 by Rémy Coutable
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: rc/add-a-ce-to-ee-merge-task