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 232
    • Issues 232
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 36
    • Merge Requests 36
  • 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
  • !350

Open
Opened 1 hour ago by Brian Hatchet@brianhatchet:speech_balloon:
  • Report abuse
Report abuse

WIP: Epic/permissions 28

MR for insight into everything that has changed for permissions

Check out, review, and merge locally

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

git fetch origin
git checkout -b "epic/permissions-28" "origin/epic/permissions-28"

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 "epic/permissions-28"

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 epic/permissions-28 into master
The source branch is 1 commit behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #86131812 passed for c9daabe0 on epic/permissions-28
          Requires 3 more approvals from Devs, Deployers, and QA.
          Emiliano Balbuena
          Emiliano Balbuena
          Marcelo Rivera
          Marcelo Rivera
          Olivia Madrid
          Olivia Madrid
          Martin Santangelo
          Martin Santangelo
          Ben Hayward
          Ben Hayward
          There are merge conflicts. Resolve these conflicts or ask someone with write access to this repository to merge it locally

          Deletes source branch

          You can merge this merge request manually using the
          • Discussion 0
          • Commits 9
          • Pipelines 6
          • Changes 65
          • Loading...
          • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %Permission #review 1 hour ago

            changed milestone to %Permission #review

          • Brian Hatchet :speech_balloon: @brianhatchet added Sprint::09/25 - Oldfashioned Owl Squad::Green scoped labels 1 hour ago

            added Sprint::09/25 - Oldfashioned Owl Squad::Green scoped labels

          • 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
          Permission #review
          Milestone
          Permission #review
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          2
          Labels
          Sprint::09/25 - Oldfashioned Owl Squad::Green
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          10
          10 participants
          user avatar
          Emiliano Balbuena
          user avatar
          Marcelo Rivera
          user avatar
          Olivia Madrid
          user avatar
          Martin Santangelo
          user avatar
          Ben Hayward
          user avatar
          Rami Albatal
          user avatar
          Guy Thouret
          Reference: minds/engine!350