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 890
    • Issues 890
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 50
    • Merge Requests 50
  • 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
  • !469

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

Fix/comments media gallery 1601

Finally got the cards working. The ultimate culprit was the comment button on the blog, which doesn't even do anything with comments, just opens the blog

Edited 3 weeks 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 fix/comments-media-gallery-1601 origin/fix/comments-media-gallery-1601

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 fix/comments-media-gallery-1601

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 fix/comments-media-gallery-1601 into master
The source branch is 79 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #76213825 passed with warnings for b1b680b5 on fix/comments-media-gallery-1601
            Requires 3 more approvals from Devs, Deployers, and QA.
            Emiliano Balbuena
            Emiliano Balbuena
            Marcelo Rivera
            Marcelo Rivera
            Mark Harding
            Mark Harding
            Ben Hayward
            Ben Hayward
            Martin Santangelo
            Martin Santangelo
            There are merge conflicts. Resolve these conflicts or ask someone with write access to this repository to merge it locally

            Deletes source branch

            You can merge this merge request manually using the
            • Discussion 2
            • Commits 14
            • Pipelines 11
            • Changes 30
            • Loading...
            • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %sprint: Interesting Iguana 1 month ago

              changed milestone to %sprint: Interesting Iguana

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

              added 1 commit

              • 85e1c3ad - Test console log

              Compare with previous version

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

              added 2 commits

              • 0f8e4a4b - Removing diagnostic comment
              • baa22ca9 - Adding activity service to whatever component implements activity.html

              Compare with previous version

            • Brian Hatchet :speech_balloon: @brianhatchet added 8 commits 1 month ago

              added 8 commits

              • baa22ca9...7ea9e831 - 7 commits from branch master
              • 50534f2a - Merge remote-tracking branch 'origin/master' into fix/comments-media-gallery-1601

              Compare with previous version

            • Brian Hatchet :speech_balloon: @brianhatchet added 19 commits 1 month ago

              added 19 commits

              • 50534f2a...d2a4fe13 - 17 commits from branch master
              • c3e702d7 - Merge remote-tracking branch 'origin/master' into fix/comments-media-gallery-1601
              • f07edd55 - Testing emi's boost component fix

              Compare with previous version

            • Mark Harding
              Mark Harding @markeharding · 1 month ago
              Owner

              @brianhatchet is this WIP?

            • Brian Hatchet :speech_balloon: @brianhatchet changed title from Fix/comments media gallery 1601 to (WIP) Fix/comments media gallery 1601 4 weeks ago

              changed title from Fix/comments media gallery 1601 to (WIP) Fix/comments media gallery 1601

            • Brian Hatchet :speech_balloon: @brianhatchet added 6 commits 4 weeks ago

              added 6 commits

              • f07edd55...4f14088f - 5 commits from branch master
              • 43dc7ff6 - Merge remote-tracking branch 'origin/master' into fix/comments-media-gallery-1601

              Compare with previous version

            • Brian Hatchet :speech_balloon: @brianhatchet added 1 commit 3 weeks ago

              added 1 commit

              • 86ce5627 - Trying skipself

              Compare with previous version

            • Brian Hatchet :speech_balloon: @brianhatchet added 5 commits 3 weeks ago

              added 5 commits

              • 86ce5627...9c9d23d9 - 4 commits from branch master
              • edc7bc92 - Merge remote-tracking branch 'origin/master' into fix/comments-media-gallery-1601

              Compare with previous version

            • Emiliano Balbuena @edgebal added 1 commit 3 weeks ago

              added 1 commit

              • dd16f684 - (fix): Inject on featured-content component

              Compare with previous version

            • Emiliano Balbuena @edgebal added 1 commit 3 weeks ago

              added 1 commit

              • 676c6f3a - (fix): Provide activity service on blog cards

              Compare with previous version

            • Brian Hatchet :speech_balloon: @brianhatchet changed title from (WIP) Fix/comments media gallery 1601 to Fix/comments media gallery 1601 3 weeks ago

              changed title from (WIP) Fix/comments media gallery 1601 to Fix/comments media gallery 1601

            • Brian Hatchet :speech_balloon: @brianhatchet changed the description 3 weeks ago

              changed the description

            • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %sprint: Kilted Koala 3 weeks ago

              changed milestone to %sprint: Kilted Koala

            • Emiliano Balbuena @edgebal approved this merge request 3 weeks ago

              approved this merge request

            • Brian Hatchet :speech_balloon: @brianhatchet added 5 commits 2 weeks ago

              added 5 commits

              • 676c6f3a...6d942fb6 - 4 commits from branch master
              • b1b680b5 - Merge branch 'master' into fix/comments-media-gallery-1601

              Compare with previous version

            • Mark Harding
              Mark Harding @markeharding · 1 hour ago
              Owner

              @brianhatchet can you sync up master?

            • 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: Kilted Koala
            Milestone
            sprint: Kilted Koala
            Assign milestone
            None
            Time tracking
            No estimate or time spent
            0
            Labels
            None
            Assign labels
            • View project labels
            Lock merge request
            Unlocked
            7
            7 participants
            user avatar
            Emiliano Balbuena
            user avatar
            Marcelo Rivera
            user avatar
            Mark Harding
            user avatar
            Ben Hayward
            user avatar
            Martin Santangelo
            user avatar
            Nicholas Lewis
            user avatar
            Brian Hatchet
            Reference: minds/front!469