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
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 130
    • Issues 130
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 26
    • Merge Requests 26
  • 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
  • !175

Open
Opened 1 day ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

(refactor): Pending activities to be checked by ACL (#436)

Check out, review, and merge locally

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

git fetch https://gitlab.com/edgebal/engine.git hotfix/entities-acl-1
git checkout -b edgebal/engine-hotfix/entities-acl-1 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 edgebal/engine-hotfix/entities-acl-1

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 edgebal:hotfix/entities-acl-1 into master
The source branch is 115 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #62634432 passed for 51a2003b on edgebal:hotfix/entities-acl-1
      Merge request approved.
      Ready to be merged automatically. Ask someone with write access to this repository to merge this request
      Allows commits from members who can merge to the target branch

      Mentions #436

      Deletes source branch

      • Discussion 1
      • Commits 1
      • Pipelines 1
      • Changes 7
      • Loading...
      • Emiliano Balbuena @edgebal mentioned in merge request !177 1 day ago

        mentioned in merge request !177

      • Emiliano Balbuena @edgebal mentioned in issue #456 1 day ago

        mentioned in issue #456

      • Mark Harding
        Mark Harding @markeharding · 2 hours ago
        Owner

        @edgebal I have put this on eggman for further testing

      • 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
      Emiliano Balbuena's avatar Emiliano Balbuena @edgebal
      Assign to
      None
      Milestone
      None
      Assign milestone
      None
      Time tracking
      No estimate or time spent
      0
      Labels
      None
      Assign labels
      • View project labels
      Lock merge request
      Unlocked
      2
      2 participants
      user avatar
      Emiliano Balbuena
      user avatar
      Mark Harding
      Reference: minds/engine!175