Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Backend - Engine
Minds Backend - Engine
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 241
    • Issues 241
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 32
    • Merge Requests 32
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Security & Compliance
    • Security & Compliance
    • Dependency List
  • 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
  • Minds Backend - EngineMinds Backend - Engine
  • Merge Requests
  • !318

Open
Opened 4 minutes ago by Brian Hatchet@brianhatchet:speech_balloon:
  • Report abuse
Report abuse

Updating to new composer hash

Check out, review, and merge locally

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

git fetch origin
git checkout -b chore-update-composer-hash origin/chore-update-composer-hash

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 chore-update-composer-hash

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.

Request to merge chore-update-composer-hash into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #81169937 running for 7a1f1e49 on chore-update-composer-hash
          Merge request approved. Approved by
          Emiliano Balbuena
          Emiliano Balbuena
          Ben Hayward
          Ben Hayward
          Rami Albatal
          Rami Albatal
          Martin Santangelo
          Martin Santangelo
          Marcelo Rivera
          Marcelo Rivera
          Mark Harding
          Mark Harding

          Set by Brian Hatchet to be merged automatically when the pipeline succeeds

          The changes will be merged into master

          The source branch will be deleted

          Deletes source branch

          • Discussion 0
          • Commits 1
          • Pipelines 1
          • Changes 1
          • Loading...
          • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %sprint: Modest Monkey 4 minutes ago

            changed milestone to %sprint: Modest Monkey

          • Brian Hatchet :speech_balloon: @brianhatchet added Squad::Green scoped label 4 minutes ago

            added Squad::Green scoped label

          • Ben Hayward @benhayward.ben approved this merge request 2 minutes ago

            approved this merge request

          • Emiliano Balbuena @edgebal approved this merge request 2 minutes ago

            approved this merge request

          • Brian Hatchet :speech_balloon: @brianhatchet enabled an automatic merge when the pipeline for 7a1f1e49 succeeds 1 minute ago

            enabled an automatic merge when the pipeline for 7a1f1e49 succeeds

          • 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
          Assignee
          Brian Hatchet's avatar
          Brian Hatchet @brianhatchet
          Assign to
          sprint: Modest Monkey
          Milestone
          sprint: Modest Monkey
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          1
          Labels
          Squad::Green
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          7
          7 participants
          user avatar
          Rami Albatal
          user avatar
          Martin Santangelo
          user avatar
          Marcelo Rivera
          user avatar
          Mark Harding
          user avatar
          Brian Hatchet
          user avatar
          Emiliano Balbuena
          user avatar
          Ben Hayward
          Reference: minds/engine!318