Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
H
Helm Charts for Minds Projects
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 1
    • Issues 1
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 2
    • Merge Requests 2
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Packages
    • Packages
    • List
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Helm Charts for Minds Projects
  • Merge Requests
  • !6

Closed
Opened 4 days ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

(chore) Added plus user

Requires merge of sandbox-wip.

Check out, review, and merge locally

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

git fetch origin
git checkout -b feat/addedPlusUser-1 origin/feat/addedPlusUser-1

Step 2. Review the changes locally

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

git fetch origin
git checkout origin/sandbox-wip
git merge --no-ff feat/addedPlusUser-1

Step 4. Push the result of the merge to GitLab

git push origin sandbox-wip

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

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

Request to merge feat/addedPlusUser-1 into sandbox-wip
  • Email patches
  • Plain diff
No approval required

Closed by Ben Hayward 5 hours ago

The changes were not merged into sandbox-wip

Deletes source branch

  • Discussion 2
  • Commits 7
  • Changes 2
  • Loading...
  • Ben Hayward @benhayward.ben mentioned in issue #1 4 days ago

    mentioned in issue #1

  • Ben Hayward @benhayward.ben added 1 commit 4 days ago

    added 1 commit

    • ff81a615 - plus user

    Compare with previous version

  • Ben Hayward @benhayward.ben added MR::Requires Changes Squad::Green scoped labels 4 days ago

    added MR::Requires Changes Squad::Green scoped labels

  • Brian Hatchet :speech_balloon: @brianhatchet changed target branch from master to sandbox-wip 3 days ago

    changed target branch from master to sandbox-wip

  • Brian Hatchet
    Brian Hatchet :speech_balloon: @brianhatchet · 3 days ago
    Maintainer

    Looks like this branch was cut from master. Please merge in the changes from sandbox-wip. I already ended the merge request to point to the sandbox-wip branch

  • Ben Hayward @benhayward.ben added 1 commit 2 days ago

    added 1 commit

    • a57b96e6 - fix

    Compare with previous version

  • Ben Hayward @benhayward.ben added 28 commits 2 days ago

    added 28 commits

    • a57b96e6...b808c190 - 27 commits from branch sandbox-wip
    • aeba4649 - Merge branch 'sandbox-wip' of gitlab.com:minds/helm-charts into feat/addedPlusUser-1

    Compare with previous version

  • Ben Hayward
    Ben Hayward @benhayward.ben · 5 hours ago
    Developer

    Closing for !7

  • Ben Hayward @benhayward.ben closed 5 hours ago

    closed

  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
0 Assignees
None
Assign to
None
Milestone
None
Assign milestone
None
Time tracking
No estimate or time spent
2
Labels
MR::Requires Changes Squad::Green
Assign labels
  • View project labels
Lock merge request
Unlocked
2
2 participants
user avatar
Ben Hayward
user avatar
Brian Hatchet
Reference: minds/helm-charts!6