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 241
    • Issues 241
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 32
    • Merge Requests 32
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • 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
  • !295

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

Feat/closed channels 602

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/closed-channels-602 origin/feat/closed-channels-602

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-open-channels
git merge --no-ff feat/closed-channels-602

Step 4. Push the result of the merge to GitLab

git push origin epic/permissions-open-channels

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/closed-channels-602 into epic/permissions-open-channels
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #78401035 passed for 50bbd9bd on feat/closed-channels-602
          Requires 2 more approvals from Devs and Deployers.
          Martin Santangelo
          Martin Santangelo
          Emiliano Balbuena
          Emiliano Balbuena
          Ben Hayward
          Ben Hayward
          Marcelo Rivera
          Marcelo Rivera
          Rami Albatal
          Rami Albatal
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Deletes source branch

          • Discussion 3
          • Commits 20
          • Pipelines 8
          • Changes 7
          0/2 threads resolved
          • Loading...
          • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %sprint: Lucky Lizard 1 week ago

            changed milestone to %sprint: Lucky Lizard

          • Brian Hatchet :speech_balloon: @brianhatchet added Squad::Green scoped label 1 week ago

            added Squad::Green scoped label

          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet · 1 week ago
            Developer

            This will be a lot smaller once the underlying rbac gets approved and merged into the epic

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

            added 3 commits

            • 80dd6482...37f3f45b - 2 commits from branch epic/permissions-open-channels
            • bc374153 - Merge remote-tracking branch 'origin/master' into feat/closed-channels-602

            Compare with previous version

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

            added 5 commits

            • a30be7ad - Merge remote-tracking branch 'origin/master' into feature/permissions-rbac-600
            • e86be901 - Immutable exception when trying to set a user in permissions
            • 15d548b5 - Proper refactor of entitiesBuilder injection
            • 505458cc - Typo fix
            • c6687670 - Merge branch 'feature/permissions-rbac-600' into feat/closed-channels-602

            Compare with previous version

            Toggle commit list
          • Brian Hatchet :speech_balloon: @brianhatchet added 6 commits 4 days ago

            added 6 commits

            • 022020ca - (feat) Add contribution values to wallet overview api - #746
            • 5a1ef698 - (chore): Bot prevention in phone number
            • f0a2ec8a - (chore): log all 2fa SMS messages
            • 3a730050 - Merge branch 'feat/746-wallet-api' into 'master'
            • 646eb771 - (chore): bump surge package
            • d27bdfae - Merge remote-tracking branch 'origin/master' into feat/closed-channels-602

            Compare with previous version

            Toggle commit list
          • Brian Hatchet :speech_balloon: @brianhatchet added 4 commits 4 days ago

            added 4 commits

            • d27bdfae...f1a95d84 - 3 commits from branch epic/permissions-open-channels
            • 022f3024 - Merge branch 'epic/permissions-open-channels' into feat/closed-channels-602

            Compare with previous version

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

            added 1 commit

            • c39461b8 - Fixed a bug checking mode 0 on the api

            Compare with previous version

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

            added 12 commits

            • c39461b8...99e9daf9 - 11 commits from branch epic/permissions-open-channels
            • 5f995cdc - Merge branch 'epic/permissions-open-channels' into feat/closed-channels-602

            Compare with previous version

          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 2 hours ago
            Common/ChannelMode.php
            1 <?php
            2
            3 namespace Minds\Common;
            4 use ReflectionClass;
            5
            6 abstract class ChannelMode
            7 {
            8 const OPEN = 0;
            9 const MODERATED = 1;
            10 const CLOSED = 2;
            11
            12 final public static function toArray()
            • Mark Harding
              Mark Harding @markeharding · 2 hours ago
              Owner

              can we get some data types in eg: toArray() : array and isValid() : bool?

            • Please register or sign in to reply
          • Mark Harding
            Mark Harding @markeharding started a thread on the diff 2 hours ago
            Entities/User.php
            10 10 */
            11 11 class User extends \ElggUser
            12 12 {
            13
            13 public const MODE_OPEN = 0;
            • Mark Harding
              Mark Harding @markeharding · 2 hours ago
              Owner

              I'm seeing these constants used in multiple places, should we not have one place which defines them?

            • Please register or sign in to reply
          • Brian Hatchet :speech_balloon: @brianhatchet added 4 commits 1 hour ago

            added 4 commits

            • 5f995cdc...b007ed64 - 3 commits from branch epic/permissions-open-channels
            • 50bbd9bd - Merge branch 'epic/permissions-open-channels' into feat/closed-channels-602

            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: Lucky Lizard
          Milestone
          sprint: Lucky Lizard
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          1
          Labels
          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
          Marcelo Rivera
          user avatar
          Rami Albatal
          user avatar
          Mark Harding
          user avatar
          Brian Hatchet
          Reference: minds/engine!295