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 65
    • Merge Requests 65
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Registry
    • Registry
  • Packages
    • Packages
  • 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
  • !371

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

(fix) Firehose frontend fixes

Enforcing a max height on videos and images.

Rem

Check out, review, and merge locally

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

git fetch https://gitlab.com/brianhatchet/front.git firehose-frontend-fixes
git checkout -b brianhatchet/front-firehose-frontend-fixes FETCH_HEAD

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 brianhatchet/front-firehose-frontend-fixes

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 brianhatchet:firehose-frontend-fixes into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #67472950 failed for 0bf172bf on brianhatchet:firehose-frontend-fixes
    Requires 2 more approvals from Devs.
    Emiliano Balbuena
    Emiliano Balbuena
    Ben Hayward
    Ben Hayward
    Mark Harding
    Mark Harding
    Martin Santangelo
    Martin Santangelo
    Marcelo Rivera
    Marcelo Rivera
    Ready to be merged automatically. Ask someone with write access to this repository to merge this request

    Allows commits from members who can merge to the target branch

    Deletes source branch

    • Discussion 0
    • Commits 2
    • Pipelines 2
    • Changes 3
    • Loading...
    • Brian Hatchet :speech_balloon: @brianhatchet changed milestone to %sprint: Hipster Hedgehog 3 hours ago

      changed milestone to %sprint: Hipster Hedgehog

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

      added 1 commit

      • 0bf172bf - fixing blog thumbnails in firehose

      Compare with previous version

    • 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: Hipster Hedgehog
    Milestone
    sprint: Hipster Hedgehog
    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
    Emiliano Balbuena
    user avatar
    Ben Hayward
    user avatar
    Mark Harding
    user avatar
    Martin Santangelo
    user avatar
    Marcelo Rivera
    user avatar
    Brian Hatchet
    Reference: minds/front!371