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
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 819
    • Issues 819
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 60
    • Merge Requests 60
  • 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
  • !340

Open
Opened 3 days ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

(bug): Hotfix layout css parse error

Noticed this error in console, wasn't really having an effect as far as I can tell, but believe it stems from one of my changes so fixed it up.

Check out, review, and merge locally

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

git fetch https://gitlab.com/benhayward.ben/front.git hotfix-layout-css-parse-error
git checkout -b benhayward.ben/front-hotfix-layout-css-parse-error 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 benhayward.ben/front-hotfix-layout-css-parse-error

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 benhayward.ben:hotfix-layout-css-parse-error into master
The source branch is 8 commits behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #65207154 (#886) passed for 0e82a87e on benhayward.ben:hotfix-layout-css-parse-error
    Requires approval from Devs. Approved by
    Mark Harding
    Mark Harding
    Marcelo Rivera
    Marcelo Rivera
    Emiliano Balbuena
    Emiliano Balbuena
    Brian Hatchet
    Brian Hatchet
    Martin Santangelo
    Martin Santangelo
    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 1
    • Commits 1
    • Pipelines 1
    • Changes 1
    • Loading...
    • Mark Harding @markeharding approved this merge request 1 hour ago

      approved this merge request

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

      @all need 2nd approval

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