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 897
    • Issues 897
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 51
    • Merge Requests 51
  • 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
  • !535

Open
Opened 21 hours ago by Brian Hatchet@brianhatchet:speech_balloon:
  • Report abuse
Report abuse

Epic/permissions open channels

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 3 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #80519765 canceled for 0a8ac473 on epic/permissions-open-channels
              Merge request approved. Approved by
              Mark Harding
              Mark Harding
              Emiliano Balbuena
              Emiliano Balbuena
              Ben Hayward
              Ben Hayward
              Guy Thouret
              Guy Thouret
              Olivia Madrid
              Olivia Madrid
              Juan Manuel Solaro
              Juan Manuel Solaro
              Ready to be merged automatically. Ask someone with write access to this repository to merge this request

              Deletes source branch

              • Discussion 2
              • Commits 6
              • Pipelines 4
              • Changes 33
              0/1 thread resolved
              • Loading...
              • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %sprint: Modest Monkey 21 hours ago

                changed milestone to %sprint: Modest Monkey

              • Brian Hatchet :speech_balloon: @brianhatchet added Squad::Green scoped label 21 hours ago

                added Squad::Green scoped label

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

                added 9 commits

                • fb452bc2...e6c32aca - 8 commits from branch master
                • 0a8ac473 - Merge remote-tracking branch 'origin/master' into epic/permissions-open-channels

                Compare with previous version

              • Mark Harding
                Mark Harding @markeharding started a thread on the diff 8 minutes ago
                src/app/common/components/channel-mode-selector/channel-mode-selector.component.ts
                32 if (!this.enabled) {
                33 return;
                34 }
                35 this.user.mode = mode;
                36 this.channelModeDropdown.close();
                37 this.update();
                38 }
                39
                40 /**
                41 * Sends the current user to the update endpoint
                42 */
                43 async update() {
                44 try {
                45 await this.client.post('api/v1/channel/info', this.user);
                46 } catch (ex) {
                47 console.error(`ex`);
                • Mark Harding
                  Mark Harding @markeharding · 8 minutes ago
                  Owner

                  how helpful is this error message?

                • Please register or sign in to reply
              • Mark Harding @markeharding approved this merge request 7 minutes ago

                approved this merge request

              • Mark Harding
                Mark Harding @markeharding · 6 minutes ago
                Owner

                Note that the dropdown selector has the selector cursor vs pointer.

              • Mark Harding @markeharding added MR::Ready to Merge scoped label 5 minutes ago

                added MR::Ready to Merge scoped label

              • 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::Ready to Merge Squad::Green
              Assign labels
              • View project labels
              Lock merge request
              Unlocked
              9
              9 participants
              user avatar
              Emiliano Balbuena
              user avatar
              Ben Hayward
              user avatar
              Guy Thouret
              user avatar
              Olivia Madrid
              user avatar
              Juan Manuel Solaro
              user avatar
              Martin Santangelo
              user avatar
              Marcelo Rivera
              Reference: minds/front!535