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 226
    • Issues 226
    • 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
  • !335

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

Feat/permissions on entities 737

Edited 27 minutes 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 "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-28"
git merge --no-ff "feat/permissions-on-entities-737"

Step 4. Push the result of the merge to GitLab

git push origin "epic/permissions-28"

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-28
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #85822683 passed for b298b5c4 on feat/permissions-on-entities-737
          Requires approval from Deployers. Approved by
          Marcelo Rivera
          Marcelo Rivera
          Martin Santangelo
          Martin Santangelo
          Emiliano Balbuena
          Emiliano Balbuena
          Ben Hayward
          Ben Hayward
          Rami Albatal
          Rami Albatal
          Mark Harding
          Mark Harding
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Deletes source branch

          • Discussion 29
          • Commits 46
          • Pipelines 26
          • Changes 47
          14/15 threads resolved
          • Loading...
          • Brian Hatchet :speech_balloon: @brianhatchet added Sprint::09/11 - Nuanced Numbat Squad::Green scoped labels 1 week ago

            added Sprint::09/11 - Nuanced Numbat Squad::Green scoped labels

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

            added 1 commit

            • a0695d01 - Testing banned role

            Compare with previous version

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

            added 1 commit

            • 2f1aee28 - Open and closed group permissions

            Compare with previous version

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

            added 1 commit

            • a110fc61 - More permissions

            Compare with previous version

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

            added 1 commit

            • dfc4f306 - Moderated channel permissions

            Compare with previous version

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

            added 1 commit

            • 01a69464 - All the permissions* (minus all the things I forgot/don't now about)

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet unmarked as a Work In Progress 1 week ago

            unmarked as a Work In Progress

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

            changed target branch from master to epic/permissions-28

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

            added 1 commit

            • 8308fd1d - Yeah for unit tests

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 2 commits 1 week ago

            added 2 commits

            • 72c7048d - (feat): record referral cookie on channel and asset pages
            • a422be04 - Merge remote-tracking branch 'origin/master' into feat/permissions-on-entities-737

            Compare with previous version

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

            added 1 commit

            • 81b20c54 - Merge fix

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 6 days ago

            added 1 commit

            • 2659fb93 - Fixing rate limit unit test that was time dependent

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 6 days ago

            added 1 commit

            • fe2dc343 - Refactoring flags out into their own class so we can iterate over the...

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 6 days ago

            added 1 commit

            • 9e615349 - Helpers/flags is now trying to check the type property on FeedSyncEntity. Need...

            Compare with previous version

          • Emiliano Balbuena @edgebal approved this merge request 5 days ago

            approved this merge request

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

            approved this merge request

          • Marcelo Rivera @eiennohi unapproved this merge request 5 days ago

            unapproved this merge request

          • Brian Hatchet :speech_balloon: @brianhatchet added 9 commits 4 days ago

            added 9 commits

            • 9e615349...26e56438 - 7 commits from branch epic/permissions-28
            • 8ab258df - Merge remote-tracking branch 'origin/master' into feat/permissions-on-entities-737
            • 40bd92e8 - Unit tests for Manager

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet changed title from Feat/permissions on entities 737 to (WIP) Feat/permissions on entities 737 4 days ago

            changed title from Feat/permissions on entities 737 to (WIP) Feat/permissions on entities 737

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

            approved this merge request

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

            added 23 commits

            • 95e7b86a - (chore): increase presigned video request to 90 days
            • b0c1432e - (fix): allow video to played if only 50% of transcodes available
            • 400bb77c - Return error if access by unknown user.
            • b69e1e50 - WIP Testing permissions on exports
            • f390f542 - Revert "(chore): increase presigned video request to 90 days"
            • 0028f4c6 - (fix): usa and japan stripe fixes
            • eaaf74d0 - (fix): us customers are required to request capabilities
            • 997ec821 - (feat): support recording multiple entity types
            • 719eb4a4 - Sprint/NuancedNumbat: Null paging token #866 (closed)
            • 1071aa8f - Merge branch 'fix/null-paging-token-866' into 'master'
            • 2ec16e85 - [Sprint/NuancedNumbat] (fix): Logout should provide $session value - Error:...
            • d8446ca6 - Merge branch 'fix/sessions-issue-773' into 'master'
            • 34594d7d - (fix): still respect activity metrics in addition to others
            • 9fec7059 - Sprint/NuancedNumbat: Added in function to return original owner guid #806 (closed)
            • 2203eec7 - Merge branch 'fix/group-report-806' into 'master'
            • a3dfc58d - (chore) Add missing spec tests for new classes; Refactor usage to not use...
            • 65b881df - Merge branch 'chore/616-propogate-props' into 'master'
            • 125e0da2 - (fix): boosts
            • 12fda64d - (chore): september email
            • 8a401b6a - (fix): 2000 not 5000 for email
            • 4f6b8f18 - Merge branch 'fix/null-user-email-setting-872' into 'master'
            • c3608afc - (fix): do not request balance if not user provided
            • 9c3c4a85 - Merge remote-tracking branch 'origin/master' into feat/permissions-on-entities-737

            Compare with previous version

            Toggle commit list
          • Brian Hatchet :speech_balloon: @brianhatchet marked as a Work In Progress from b69e1e50 1 day ago

            marked as a Work In Progress from b69e1e50

          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 day ago
            Resolved by Brian Hatchet 2 hours ago
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 day ago
            Resolved by Brian Hatchet 2 hours ago
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 day ago
            Resolved by Brian Hatchet 2 hours ago
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 day ago
            Resolved by Brian Hatchet 1 hour ago
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 day ago
            Resolved by Brian Hatchet 1 hour ago
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 day ago
            Resolved by Brian Hatchet 1 hour ago
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 day ago
            Resolved by Brian Hatchet 1 hour ago
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 day ago
            Resolved by Brian Hatchet 1 hour ago
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 day ago
            Resolved by Brian Hatchet 1 hour ago
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 day ago
            Resolved by Brian Hatchet 1 hour ago
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 day ago
            Resolved by Brian Hatchet 1 hour ago
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 day ago
            Resolved by Brian Hatchet 1 hour ago
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 day ago
            Resolved by Brian Hatchet 1 hour ago
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on an old version of the diff 1 day ago
            Last updated by Brian Hatchet 58 minutes ago
            Controllers/api/v2/feeds/subscribed.php
            122 120 }
            123 121 }
            124 122
            123 $permissions = null;
            124 //Calculate new permissions object with the entities
            125 if (Di::_()->get('Features\Manager')->has('permissions')) {
            • Marcelo Rivera
              Marcelo Rivera @eiennohi · 1 day ago
              Developer

              do we need this now that we're including permissions on the export itself?

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

              changed this line in version 20 of the diff

            • Please register or sign in to reply
          • Marcelo Rivera
            Marcelo Rivera @eiennohi started a thread on the diff 1 day ago
            Resolved by Brian Hatchet 1 hour ago
          • Brian Hatchet :speech_balloon: @brianhatchet added 6 commits 2 hours ago

            added 6 commits

            • 9c3c4a85...1adc33a5 - 5 commits from branch epic/permissions-28
            • 3cff4b90 - Merge branch 'epic/permissions-28' into feat/permissions-on-entities-737

            Compare with previous version

          • Marcelo Rivera @eiennohi added 2 commits 1 hour ago

            added 2 commits

            • cc104246 - (fix): import and PHPDoc
            • f310dde2 - (fix): correctly hydrate entities

            Compare with previous version

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

            added 1 commit

            • a1379dea - Refactor and fixing up unit tests

            Compare with previous version

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

            added 1 commit

            • 11046c94 - Removing the kudzu, now we don't need to touch every entity

            Compare with previous version

          • Marcelo Rivera @eiennohi mentioned in issue #908 (closed) 39 minutes ago

            mentioned in issue #908 (closed)

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

            added 1 commit

            • b298b5c4 - Linting

            Compare with previous version

          • Brian Hatchet :speech_balloon: @brianhatchet unmarked as a Work In Progress 28 minutes ago

            unmarked as a Work In Progress

          • Brian Hatchet :speech_balloon: @brianhatchet changed title from WIP: (WIP) Feat/permissions on entities 737 to Feat/permissions on entities 737 28 minutes ago

            changed title from WIP: (WIP) Feat/permissions on entities 737 to Feat/permissions on entities 737

          • Marcelo Rivera @eiennohi approved this merge request 25 minutes ago

            approved this merge request

          • 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
          None
          Milestone
          None
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          2
          Labels
          Sprint::09/11 - Nuanced Numbat Squad::Green
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          7
          7 participants
          user avatar
          Martin Santangelo
          user avatar
          Emiliano Balbuena
          user avatar
          Ben Hayward
          user avatar
          Rami Albatal
          user avatar
          Mark Harding
          user avatar
          Brian Hatchet
          user avatar
          Marcelo Rivera
          Reference: minds/engine!335