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 827
    • Issues 827
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 43
    • Merge Requests 43
  • 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
  • !467

Open
Opened 23 hours ago by Olivia Madrid@omadrid
  • Report abuse
Report abuse

WIP: (feat): Media modal

Will close #1539 and #1600

Edited 22 hours ago by Olivia Madrid

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/media-modal-1539 origin/feat/media-modal-1539

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 feat/media-modal-1539

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 feat/media-modal-1539 into master
The source branch is 6 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #73618699 passed for 0a76cb90 on feat/media-modal-1539
          Requires 2 more approvals from Devs and Deployers.
          Mark Harding
          Mark Harding
          Martin Santangelo
          Martin Santangelo
          Brian Hatchet
          Brian Hatchet
          Ben Hayward
          Ben Hayward
          Marcelo Rivera
          Marcelo Rivera
          There are merge conflicts. Resolve these conflicts or ask someone with write access to this repository to merge it locally

          Mentions #1539 and #1600

          You can merge this merge request manually using the
          • Discussion 2
          • Commits 7
          • Pipelines 5
          • Changes 14
          0/1 thread resolved
          • Loading...
          • Olivia Madrid @omadrid added 21 commits 23 hours ago

            added 21 commits

            • 76f1573e...3130dd25 - 20 commits from branch master
            • 811fc6c4 - Merge branch 'master' of gitlab.com:minds/front into feat/media-modal-1539

            Compare with previous version

          • Olivia Madrid @omadrid added 1 commit 23 hours ago

            added 1 commit

            • 9dd42d20 - (feat): Media modal - removed a condition

            Compare with previous version

          • Olivia Madrid @omadrid changed the description 22 hours ago

            changed the description

          • Olivia Madrid @omadrid mentioned in issue #1539 22 hours ago

            mentioned in issue #1539

          • Olivia Madrid @omadrid added 6 commits 15 hours ago

            added 6 commits

            • 9dd42d20...1790d347 - 4 commits from branch master
            • b8976fe4 - Merge branch 'master' of gitlab.com:minds/front into feat/media-modal-1539
            • 7d9266cb - (feat): Media modal

            Compare with previous version

          • Olivia Madrid @omadrid added 2 commits 15 hours ago

            added 2 commits

            • e3143161 - 1 commit from branch master
            • 0a76cb90 - Merge branch 'master' of gitlab.com:minds/front into feat/media-modal-1539

            Compare with previous version

          • Mark Harding @markeharding added Squad::Blue scoped label 9 hours ago

            added Squad::Blue scoped label

            • Mark Harding
              Mark Harding @markeharding · 9 hours ago
              Owner

              I have some funny border colours going on?

            • Collapse replies
            • Olivia Madrid
              Olivia Madrid @omadrid · 9 minutes ago
              Developer

              Those are temporary just so I can better see what's happening while fixing the overflow/scroll issues

            • Please register or sign in to reply
          • 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
          0 Assignees
          None
          Assign to
          None
          Milestone
          None
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          1
          Labels
          Squad::Blue
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          7
          7 participants
          user avatar
          Mark Harding
          user avatar
          Martin Santangelo
          user avatar
          Brian Hatchet
          user avatar
          Ben Hayward
          user avatar
          Marcelo Rivera
          user avatar
          Emiliano Balbuena
          user avatar
          Olivia Madrid
          Reference: minds/front!467