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 242
    • Issues 242
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 31
    • Merge Requests 31
  • 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
  • !304

Closed
Opened 1 week ago by Brian Hatchet@brianhatchet:speech_balloon:
  • Report abuse
Report abuse

WIP: Feat/permissions on entities 737

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/permissions-on-entities-737 origin/feat/permissions-on-entities-737

Step 2. Review the changes locally

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

git fetch origin
git checkout origin/epic/permissions-open-channels
git merge --no-ff feat/permissions-on-entities-737

Step 4. Push the result of the merge to GitLab

git push origin epic/permissions-open-channels

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/permissions-on-entities-737 into epic/permissions-open-channels
  • Email patches
  • Plain diff
Pipeline #80250557 failed for 36b9df4c on feat/permissions-on-entities-737
          Requires 2 more approvals from Devs and Deployers.
          Emiliano Balbuena
          Emiliano Balbuena
          Martin Santangelo
          Martin Santangelo
          Marcelo Rivera
          Marcelo Rivera
          Mark Harding
          Mark Harding
          Rami Albatal
          Rami Albatal

          Closed by Brian Hatchet 1 hour ago

          The changes were not merged into epic/permissions-open-channels

          Deletes source branch

          • Discussion 0
          • Commits 8
          • Pipelines 6
          • Changes 18
          • Loading...
          • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %sprint: Modest Monkey 1 week ago

            changed milestone to %sprint: Modest Monkey

          • Brian Hatchet :speech_balloon: @brianhatchet added Squad::Green scoped label 1 week ago

            added Squad::Green scoped label

          • Brian Hatchet :speech_balloon: @brianhatchet changed target branch from master to epic/permissions-open-channels 1 week ago

            changed target branch from master to epic/permissions-open-channels

          • Brian Hatchet :speech_balloon: @brianhatchet added 10 commits 6 days ago

            added 10 commits

            • 42a5e30d...1231e20a - 9 commits from branch epic/permissions-open-channels
            • dc0fc1fd - Merge remote-tracking branch 'origin/master' into feat/permissions-on-entities-737

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 8 commits 6 days ago

            added 8 commits

            • dc0fc1fd...34aca270 - 7 commits from branch epic/permissions-open-channels
            • 5352bd55 - lint

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 7 commits 2 days ago

            added 7 commits

            • 5352bd55...f7700208 - 6 commits from branch epic/permissions-open-channels
            • 36b9df4c - Merge branch 'epic/permissions-open-channels' into feat/permissions-on-entities-737

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet closed 1 hour 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
          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
          Emiliano Balbuena
          user avatar
          Martin Santangelo
          user avatar
          Marcelo Rivera
          user avatar
          Mark Harding
          user avatar
          Rami Albatal
          user avatar
          Ben Hayward
          user avatar
          Brian Hatchet
          Reference: minds/engine!304