Skip to content

Next

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

Open
Opened 3 hours ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/InterestingIguana](chore) Add GitLab to settings example

Noticed it was missing.

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-setting-example origin/chore/update-setting-example

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-setting-example

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-setting-example into master
The source branch is 2 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #70771057 canceled for 0305c097 on chore/update-setting-example
          Merge request approved. Approved by
          Brian Hatchet
          Brian Hatchet
          Mark Harding
          Mark Harding
          Rami Albatal
          Rami Albatal
          Emiliano Balbuena
          Emiliano Balbuena
          Martin Santangelo
          Martin Santangelo
          Marcelo Rivera
          Marcelo Rivera
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Deletes source branch

          • Discussion 1
          • Commits 1
          • Pipelines 3
          • Changes 1
          • Loading...
          • Ben Hayward
            Ben Hayward @benhayward.ben · 3 hours ago
            Developer

            Stopped the pipeline as I don't think its necessary here

          • Ben Hayward @benhayward.ben added 2 commits 3 hours ago

            added 2 commits

            • 82b5cc09 - Merge branch 'master' of gitlab.com:minds/engine into chore/update-setting-example
            • 5f618b34 - missing gitlab example

            Compare with previous version

          • Ben Hayward @benhayward.ben added 1 commit 3 hours ago

            added 1 commit

            • 0305c097 - Updated to add gitlab example

            Compare with previous version

          • Mark Harding @markeharding approved this merge request 2 hours ago

            approved this merge request

          • Ben Hayward @benhayward.ben added MR::Awaiting Review label 32 minutes ago

            added MR::Awaiting Review label

          • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 16 minutes ago

            approved this merge request

          • 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
          1
          Labels
          MR::Awaiting Review
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          7
          7 participants
          user avatar
          Rami Albatal
          user avatar
          Emiliano Balbuena
          user avatar
          Martin Santangelo
          user avatar
          Marcelo Rivera
          user avatar
          Brian Hatchet
          user avatar
          Mark Harding
          user avatar
          Ben Hayward
          Reference: minds/engine!268