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 848
    • Issues 848
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 47
    • Merge Requests 47
  • 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
  • !576

Open
Opened 1 hour ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

(fix): Correctly pass comment entity to media modal

Closes #2003

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b "hotfix/comments-att-modal" "origin/hotfix/comments-att-modal"

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 "hotfix/comments-att-modal"

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 hotfix/comments-att-modal into master
The source branch is 5 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #85510044 passed with warnings for 0bb1bbf6 on hotfix/comments-att-modal
              Merge request approved. Approved by
              Marcelo Rivera
              Marcelo Rivera
              Xander Miller
              Xander Miller
              Brian Hatchet
              Brian Hatchet
              Mark Harding
              Mark Harding
              Ready to be merged automatically. Ask someone with write access to this repository to merge this request

              Closes #2003

              Deletes source branch

              • Discussion 2
              • Commits 1
              • Pipelines 1
              • Changes 3
              • Loading...
              • Emiliano Balbuena @edgebal added Product::Platform Squad::Yellow scoped labels 1 hour ago

                added Product::Platform Squad::Yellow scoped labels

              • Mark Harding @markeharding approved this merge request 37 minutes ago

                approved this merge request

              • Brian Hatchet :speech_balloon: @brianhatchet approved this merge request 36 minutes ago

                approved this merge request

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

                Make sure you set Minds.features['media-modal'] = true; in the console first.

              • Xander Miller
                Xander Miller @xander-miller · 14 minutes ago
                Developer

                I'm getting some console errors testing this but I think they are unrelated to this fix.

                hotfix-comments-att-modal.minds.io_cosole_bugs.har

              • Xander Miller @xander-miller approved this merge request 4 minutes ago

                approved this merge request

              • Marcelo Rivera @eiennohi approved this merge request 1 minute 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
              Emiliano Balbuena's avatar
              Emiliano Balbuena @edgebal
              Assign to
              None
              Milestone
              None
              Assign milestone
              None
              Time tracking
              No estimate or time spent
              2
              Labels
              Product::Platform Squad::Yellow
              Assign labels
              • View project labels
              Lock merge request
              Unlocked
              10
              10 participants
              user avatar
              Guy Thouret
              user avatar
              Ben Hayward
              user avatar
              Martin Santangelo
              user avatar
              Juan Manuel Solaro
              user avatar
              Olivia Madrid
              user avatar
              Emiliano Balbuena
              user avatar
              Marcelo Rivera
              Reference: minds/front!576