Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 832
    • Issues 832
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 45
    • Merge Requests 45
  • 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 FrontendMinds Frontend
  • Merge Requests
  • !558

Open
Opened 2 hours ago by Mark Harding@markeharding
  • Report abuse
Report abuse

creating and accepting subscriptions

Closes #1504

Edited 20 minutes ago by Mark Harding

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-sub-reqs" "origin/epic/permissions-sub-reqs"

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-sub-reqs"

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-sub-reqs into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #82752785 running for 38b66a93 on epic/permissions-sub-reqs
              Requires 2 more approvals from Devs and Deployers.
              Ben Hayward
              Ben Hayward
              Juan Manuel Solaro
              Juan Manuel Solaro
              Marcelo Rivera
              Marcelo Rivera
              Brian Hatchet
              Brian Hatchet
              Guy Thouret
              Guy Thouret
              Ready to be merged automatically. Ask someone with write access to this repository to merge this request

              Closes #1504

              Deletes source branch

              • Discussion 0
              • Commits 3
              • Pipelines 3
              • Changes 10
              • Loading...
              • Mark Harding @markeharding changed milestone to %Permission #review 2 hours ago

                changed milestone to %Permission #review

              • Mark Harding @markeharding added Priority::1 - High Product::Security Sprint::09/11 - Nuanced Numbat Squad::Blue scoped labels 2 hours ago

                added Priority::1 - High Product::Security Sprint::09/11 - Nuanced Numbat Squad::Blue scoped labels

              • Mark Harding @markeharding added 1 commit 2 hours ago

                added 1 commit

                • 6c161017 - (fix): failing tests

                Compare with previous version

              • Mark Harding @markeharding added 1 commit 21 minutes ago

                added 1 commit

                • 38b66a93 - (feat): notification views for subscription requests

                Compare with previous version

              • Mark Harding @markeharding unmarked as a Work In Progress 20 minutes ago

                unmarked as a Work In Progress

              • 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
              Permission #review
              Milestone
              Permission #review
              Assign milestone
              None
              Time tracking
              No estimate or time spent
              4
              Labels
              Priority::1 - High Product::Security Sprint::09/11 - Nuanced Numbat Squad::Blue
              Assign labels
              • View project labels
              Lock merge request
              Unlocked
              9
              9 participants
              user avatar
              Ben Hayward
              user avatar
              Juan Manuel Solaro
              user avatar
              Marcelo Rivera
              user avatar
              Brian Hatchet
              user avatar
              Guy Thouret
              user avatar
              Emiliano Balbuena
              user avatar
              Martin Santangelo
              Reference: minds/front!558