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 243
    • Issues 243
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 35
    • Merge Requests 35
  • 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
  • !307

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

Epic/permissions open channels

Let's get this closed off so we can get all the e2e tests up and running before I commit the next big block of permissions

Edited 22 hours ago by Brian Hatchet

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-open-channels origin/epic/permissions-open-channels

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-open-channels

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-open-channels into master
The source branch is 1 commit behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #80587986 failed for 31f45fc5 on epic/permissions-open-channels
          Requires 2 more approvals from Devs and Deployers.
          Ben Hayward
          Ben Hayward
          Rami Albatal
          Rami Albatal
          Mark Harding
          Mark Harding
          Emiliano Balbuena
          Emiliano Balbuena
          Martin Santangelo
          Martin Santangelo
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Deletes source branch

          • Discussion 29
          • Commits 11
          • Pipelines 9
          • Changes 37
          13/14 threads resolved
          • 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 added 1 commit 1 week ago

            added 1 commit

            • 34aca270 - Linting

            Compare with previous version

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

            added 6 commits

            • 34aca270...d684846f - 5 commits from branch master
            • f7700208 - Merge remote-tracking branch 'origin/master' into epic/permissions-open-channels

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet unmarked as a Work In Progress 22 hours ago

            unmarked as a Work In Progress

          • Brian Hatchet :speech_balloon: @brianhatchet changed the description 22 hours ago

            changed the description

          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 hour ago
            Last updated by Brian Hatchet 35 minutes ago
            Core/Permissions/Permissions.php
            21 /** @var bool */
            22 private $isBanned = false;
            23 /** @var User */
            24 private $user;
            25 /** @var Roles */
            26 private $roles;
            27 /** @var array */
            28 private $entities;
            29 /** @var ChannelRoleCalculator */
            30 private $channelRoleCalculator;
            31 /** @var GroupRoleCalculator */
            32 private $groupRoleCalculator;
            33 /** @var EntitiesBuilder */
            34 private $entitiesBuilder;
            35
            36 public function setUser(User $user)
            • Mark Harding
              Mark Harding @markeharding · 1 hour ago
              Owner

              Return type would be nice

            • Brian Hatchet :speech_balloon: @brianhatchet changed this line in version 4 of the diff 35 minutes ago

              changed this line in version 4 of the diff

            • Please register or sign in to reply
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 hour ago
            Resolved by Brian Hatchet 52 minutes ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 hour ago
            Resolved by Brian Hatchet 51 minutes ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 hour ago
            Resolved by Brian Hatchet 50 minutes ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 hour ago
            Resolved by Brian Hatchet 49 minutes ago
          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 1 hour ago
            Resolved by Brian Hatchet 49 minutes ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 hour ago
            Resolved by Brian Hatchet 46 minutes ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 hour ago
            Resolved by Brian Hatchet 46 minutes ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 hour ago
            Resolved by Brian Hatchet 45 minutes ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 hour ago
            Resolved by Brian Hatchet 45 minutes ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 hour ago
            Resolved by Brian Hatchet 45 minutes ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 hour ago
            Resolved by Brian Hatchet 45 minutes ago
          • Mark Harding
            Mark Harding @markeharding started a thread on an old version of the diff 1 hour ago
            Resolved by Brian Hatchet 44 minutes ago
          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 1 hour ago
            Resolved by Brian Hatchet 42 minutes ago
          • Mark Harding @markeharding added MR::Requires Changes scoped label 1 hour ago

            added MR::Requires Changes scoped label

          • Mark Harding
            Mark Harding @markeharding · 1 hour ago
            Owner

            Looks great. How are we feeling about caching?

          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet · 40 minutes ago
            Developer

            That it is one of the hardest problems in CS next to naming of things and feature flags, but we'll probably need it eventually. This hole this is pretty static beyond potential retrieval of new entities, which are already potentially cached.

            Once we get it all humming along, it shouldn't be too hard to cache persistent versions of these, but the dynamic entity calculation will be fun to refresh

          • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 34 minutes ago

            added 1 commit

            • 31f45fc5 - MR changes

            Compare with previous version

          • 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
          2
          Labels
          MR::Requires Changes Squad::Green
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          7
          7 participants
          user avatar
          Ben Hayward
          user avatar
          Rami Albatal
          user avatar
          Mark Harding
          user avatar
          Emiliano Balbuena
          user avatar
          Martin Santangelo
          user avatar
          Marcelo Rivera
          user avatar
          Brian Hatchet
          Reference: minds/engine!307