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 870
    • Issues 870
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 53
    • Merge Requests 53
  • 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 FrontendMinds Frontend
  • Merge Requests
  • !499

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 #78028991 running for 43db0d16 on feat/closed-channels-602
            Requires 2 more approvals from Devs and Deployers.
            Emiliano Balbuena
            Emiliano Balbuena
            Martin Santangelo
            Martin Santangelo
            Marcelo Rivera
            Marcelo Rivera
            Ben Hayward
            Ben Hayward
            Olivia Madrid
            Olivia Madrid
            Ready to be merged automatically. Ask someone with write access to this repository to merge this request

            Deletes source branch

            • Discussion 11
            • Commits 24
            • Pipelines 19
            • Changes 31
            5/5 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 :speech_balloon: @brianhatchet added 14 commits 3 days ago

              added 14 commits

              • ed5c797d - Sprint/KiltedKoala: Added in wire transaction e2e test #1641 (closed)
              • bfd7f8ed - Merge branch 'feat/wire-e2e-1641' into 'master'
              • fa9d8d65 - Sprint/KiltedKoala: Added in comment-tree e2e tests #1635 (closed)
              • c55bb642 - Merge branch 'feat/comment-tree-e2e-1635' into 'master'
              • 30f6bcee - Sprint/KiltedKoala: Added e2e tests for onboarding #1639 (closed)
              • c3300d5b - Merge branch 'feat/onboarding-e2e-1639' into 'master'
              • 442c8ce9 - Sprint/KiltedKoala: Added e2e tests for boost impressions #1634 (closed)
              • ef9383fc - Merge branch 'feat/boost-impressions-1634' into 'master'
              • 3c09991d - Sprint/KiltedKoala: Added e2e test for boost rejection in console #1633 (closed)
              • 39b6fcb6 - Merge branch 'feat/boost-console-e2e-1633' into 'master'
              • e98051fe - Sprint/KiltedKoala: Added in e2e for addition and deletion of remind. #1637 (closed)
              • 268165b1 - Merge branch 'feat/remind-e2e-1637' into 'master'
              • caaf44dd - Merge remote-tracking branch 'origin/master' into feat/closed-channels-602
              • c6dcfe5b - Optimizing e2e tests

              Compare with previous version

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

              added 4 commits

              • 0d69d125 - Sprint/KiltedKoala: Media modal
              • 13c6f471 - Merge branch 'feat/media-modal-1539' into 'master'
              • 4d4b5217 - (chore): update media modal page
              • 80b21460 - Merge remote-tracking branch 'origin/master' into feat/closed-channels-602

              Compare with previous version

              Toggle commit list
            • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 2 days ago

              added 1 commit

              • 4157b7cf - Optimizing unit tests

              Compare with previous version

            • Ben Hayward @benhayward.ben added 1 commit 2 days ago

              added 1 commit

              • 0a7ad244 - Fixed test

              Compare with previous version

            • Ben Hayward @benhayward.ben added 1 commit 2 days ago

              added 1 commit

              • 851177c8 - missed somethign

              Compare with previous version

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

              added 1 commit

              • a3357f1a - Fixed tests up to groups

              Compare with previous version

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

              added 1 commit

              • 76dd3659 - Fixing before

              Compare with previous version

            • Ben Hayward @benhayward.ben added 1 commit 1 day ago

              added 1 commit

              • 57595be0 - Fixed flaking in newsfeed test

              Compare with previous version

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

              added 15 commits

              • ce8f950a - (fix): Boost marketing hero overlay correctly positioned
              • 99603881 - (fix): user's own avatar not blurry on newsfeed
              • 12fd31a8 - (chore): Stop tooltip cutoff on referrals dashboard on mobile
              • 9c57ecf8 - Merge branch 'chore/referral-tooltip-cutoff-1552' into 'master'
              • c71e2be4 - Sprint/LuckyLizard: Changed ng test reporter for clearer output.
              • 7806119a - Merge branch 'chore/change-test-reporter-1745' into 'master'
              • c70ca1f0 - Merge branch 'fix/blurry-avatar-1746' into 'master'
              • 7ba536e1 - Sprint/LuckyLizard: Removed redirect on failed password reset.
              • 8f58bb2e - Merge branch 'fix/password-reset-725' into 'master'
              • 4a15081e - Merge branch 'fix/boost-mkting-overlay-1733' into 'master'
              • 0e26962a - Sprint/KiltedKoala: Fix/video pause on rotate #1418 (closed)
              • e2eccb3a - Merge branch 'fix/video-pause-on-rotate-1418' into 'master'
              • d52600d6 - Merge remote-tracking branch 'origin/master' into feat/closed-channels-602
              • 497547a4 - Merge branch 'feat/closed-channels-602' of gitlab.com:minds/front into feat/closed-channels-602
              • 2ed394f1 - Everything working edition

              Compare with previous version

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

              added 1 commit

              • 40381ea2 - Blog xhr routes

              Compare with previous version

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

              added 1 commit

              • 6e0ea629 - Removed a console log

              Compare with previous version

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

              added 1 commit

              • fbfe9770 - Added our project id to cypress. Removed timeouts

              Compare with previous version

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

              added 1 commit

              • 47614578 - Putting timeouts back

              Compare with previous version

            • Brian Hatchet :speech_balloon: @brianhatchet added 5 commits 21 hours ago

              added 5 commits

              • 37ac7b64 - (rollback): Regression created where newsfeeds blow up - #1766
              • ec161448 - (feat): sentry for angular
              • 2a24666e - (fix): do not throw error for missing entity, log in console
              • 0cafd414 - Merge remote-tracking branch 'origin/master' into feat/closed-channels-602
              • 324b0ded - Electron hates our file upload workaround. The npm package that addresses that...

              Compare with previous version

              Toggle commit list
            • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 21 hours ago

              added 1 commit

              • 706414c8 - Adding timeouts back

              Compare with previous version

            • Ben Hayward
              Ben Hayward @benhayward.ben started a thread on an old version of the diff 1 hour ago
              Resolved by Brian Hatchet 36 minutes ago
            • Ben Hayward
              Ben Hayward @benhayward.ben started a thread on the diff 1 hour ago
              Resolved by Brian Hatchet 40 minutes ago
            • Ben Hayward
              Ben Hayward @benhayward.ben started a thread on an old version of the diff 1 hour ago
              Resolved by Brian Hatchet 48 minutes ago
            • Ben Hayward
              Ben Hayward @benhayward.ben started a thread on an old version of the diff 53 minutes ago
              Resolved by Brian Hatchet 47 minutes ago
            • Brian Hatchet :speech_balloon: @brianhatchet added 5 commits 49 minutes ago

              added 5 commits

              • 706414c8...6a48c5b1 - 4 commits from branch epic/permissions-open-channels
              • 1c983fd9 - Merge remote-tracking branch 'origin/master' into feat/closed-channels-602

              Compare with previous version

            • Ben Hayward
              Ben Hayward @benhayward.ben started a thread on an old version of the diff 49 minutes ago
              Resolved by Brian Hatchet 37 minutes ago
            • Brian Hatchet :speech_balloon: @brianhatchet resolved all threads 37 minutes ago

              resolved all threads

            • Brian Hatchet :speech_balloon: @brianhatchet resolved all threads 36 minutes ago

              resolved all threads

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

              added 1 commit

              • 3065c379 - CR changes

              Compare with previous version

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

              added 1 commit

              • 43db0d16 - Fixed test

              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
            9
            9 participants
            user avatar
            Emiliano Balbuena
            user avatar
            Martin Santangelo
            user avatar
            Marcelo Rivera
            user avatar
            Ben Hayward
            user avatar
            Olivia Madrid
            user avatar
            Guy Thouret
            user avatar
            Juan Manuel Solaro
            Reference: minds/front!499