Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Frontend
Minds Frontend
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 855
    • Issues 855
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 41
    • Merge Requests 41
  • 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
  • !469

Open
Opened 3 days ago by Brian Hatchet@brianhatchet:speech_balloon:
  • Report abuse
Report abuse

Fix/comments media gallery 1601

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 1 commit behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #74460663 passed with warnings for f07edd55 on fix/comments-media-gallery-1601
            Requires 2 more approvals from Devs and Deployers.
            Mark Harding
            Mark Harding
            Emiliano Balbuena
            Emiliano Balbuena
            Marcelo Rivera
            Marcelo Rivera
            Martin Santangelo
            Martin Santangelo
            Ben Hayward
            Ben Hayward
            Ready to be merged automatically. Ask someone with write access to this repository to merge this request
            • Discussion 1
            • Commits 8
            • Pipelines 5
            • Changes 29
            • Loading...
            • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %sprint: Interesting Iguana 3 days ago

              changed milestone to %sprint: Interesting Iguana

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

              added 1 commit

              • 85e1c3ad - Test console log

              Compare with previous version

            • Brian Hatchet :speech_balloon: @brianhatchet added 2 commits 2 days 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 2 days 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 hour 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 hour ago
              Owner

              @brianhatchet is this WIP?

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