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 864
    • Issues 864
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 46
    • Merge Requests 46
  • 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

Merged
Opened 2 weeks ago by Mark Harding@markeharding
  • Report abuse
Report abuse

creating and accepting subscriptions

Closes #1504 (closed)

Edited 2 weeks ago by Mark Harding
Request to merge epic/permissions-sub-reqs into epic/permissions-28
  • Email patches
  • Plain diff
Pipeline #85608665 passed with warnings for 1f47d19e on epic/permissions-sub-reqs
              Merge request approved. Approved by
              Brian Hatchet
              Brian Hatchet
              Marcelo Rivera
              Marcelo Rivera
              Emiliano Balbuena
              Emiliano Balbuena

              Merged by Brian Hatchet 23 minutes ago

              The changes were merged into epic/permissions-28 with cddfe67e

              The source branch has been deleted

              Pipeline #86107591 failed for cddfe67e on epic/permissions-28
                          • Discussion 0
                          • Commits 8
                          • Pipelines 8
                          • Changes 14
                          • Loading...
                          • Mark Harding @markeharding changed milestone to %Permission #review 2 weeks 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 weeks ago

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

                          • Mark Harding @markeharding added 1 commit 2 weeks ago

                            added 1 commit

                            • 6c161017 - (fix): failing tests

                            Compare with previous version

                          • Mark Harding @markeharding added 1 commit 2 weeks ago

                            added 1 commit

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

                            Compare with previous version

                          • Mark Harding @markeharding unmarked as a Work In Progress 2 weeks ago

                            unmarked as a Work In Progress

                          • Mark Harding @markeharding added 1 commit 1 week ago

                            added 1 commit

                            • 30dafeda - (chore): use / endpoint vs /all

                            Compare with previous version

                          • Mark Harding @markeharding mentioned in issue #1503 4 days ago

                            mentioned in issue #1503

                          • Brian Hatchet :speech_balloon: @brianhatchet changed target branch from master to epic/permissions-28 2 days ago

                            changed target branch from master to epic/permissions-28

                          • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 2 days ago

                            approved this merge request

                          • Marcelo Rivera @eiennohi approved this merge request 2 days ago

                            approved this merge request

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

                            added 22 commits

                            • 30dafeda...210b74cb - 16 commits from branch epic/permissions-28
                            • 3cec965f - (fix): if error, pass through to channel component
                            • 5b94c667 - (feat): extend views to blogs media channels and modals
                            • f25fe947 - (e2e) Refactor part of blog integration test and add tests for activity...
                            • 181b3be2 - Merge branch 'chore/616-propogate-props' into 'master'
                            • 8a4d3623 - (chore): not necessary to trigger initial view from rotator anymore
                            • 793e21e9 - Merge remote-tracking branch 'origin/master' into epic/permissions-sub-reqs

                            Compare with previous version

                            Toggle commit list
                          • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 2 days ago

                            approved this merge request

                          • Marcelo Rivera @eiennohi approved this merge request 1 day ago

                            approved this merge request

                          • Brian Hatchet :speech_balloon: @brianhatchet added 13 commits 1 day ago

                            added 13 commits

                            • 793e21e9...cab480dd - 12 commits from branch epic/permissions-28
                            • 27850f6f - Merge branch 'epic/permissions-28' into epic/permissions-sub-reqs

                            Compare with previous version

                          • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 1 day ago

                            approved this merge request

                          • Brian Hatchet :speech_balloon: @brianhatchet enabled an automatic merge when the pipeline for 27850f6f succeeds 1 day ago

                            enabled an automatic merge when the pipeline for 27850f6f succeeds

                          • Marcelo Rivera @eiennohi approved this merge request 1 day ago

                            approved this merge request

                          • Marcelo Rivera @eiennohi aborted the automatic merge because source branch was updated 1 day ago

                            aborted the automatic merge because source branch was updated

                          • Marcelo Rivera @eiennohi added 1 commit 1 day ago

                            added 1 commit

                            • d75735ce - (fix): spec tests

                            Compare with previous version

                          • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 1 day ago

                            added 1 commit

                            • 1f47d19e - Fixing build errors

                            Compare with previous version

                          • Marcelo Rivera @eiennohi approved this merge request 1 day ago

                            approved this merge request

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

                            approved this merge request

                          • Brian Hatchet :speech_balloon: @brianhatchet merged 23 minutes ago

                            merged

                          • Brian Hatchet :speech_balloon: @brianhatchet mentioned in commit cddfe67e 23 minutes ago

                            mentioned in commit cddfe67e

                          • 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
                          Emiliano Balbuena
                          user avatar
                          Olivia Madrid
                          user avatar
                          Martin Santangelo
                          user avatar
                          Ben Hayward
                          user avatar
                          Juan Manuel Solaro
                          user avatar
                          Guy Thouret
                          user avatar
                          Brian Hatchet
                          Reference: minds/front!558

                          Revert this merge request

                          This will create a new commit in order to revert the existing changes.

                          Switch branch
                          Cancel
                          A new branch will be created in your fork and a new merge request will be started.

                          Cherry-pick this merge request

                          Switch branch
                          Cancel
                          A new branch will be created in your fork and a new merge request will be started.