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 878
    • Issues 878
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 55
    • Merge Requests 55
  • 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
  • !516

Open
Opened 10 minutes ago by Emiliano Balbuena@edgebal
  • Report abuse
Report abuse

[Sprint/LuckyLizard] (chore): Use local fontawesome 4.7

Check out, review, and merge locally

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

git fetch origin
git checkout -b chore/local-fontawesome origin/chore/local-fontawesome

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 chore/local-fontawesome

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 chore/local-fontawesome into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #78193715 running for 44d6df20 on chore/local-fontawesome
            Requires 2 more approvals from Devs and Deployers.
            Martin Santangelo
            Martin Santangelo
            Brian Hatchet
            Brian Hatchet
            Olivia Madrid
            Olivia Madrid
            Ben Hayward
            Ben Hayward
            Guy Thouret
            Guy Thouret
            Ready to be merged automatically. Ask someone with write access to this repository to merge this request

            Deletes source branch

            • Discussion 0
            • Commits 1
            • Pipelines 1
            • Changes 10
            • Loading...
            • Emiliano Balbuena @edgebal changed milestone to %sprint: Lucky Lizard 10 minutes ago

              changed milestone to %sprint: Lucky Lizard

            • Emiliano Balbuena @edgebal added Product::Common Squad::Yellow scoped labels 10 minutes ago

              added Product::Common Squad::Yellow scoped labels

            • Emiliano Balbuena @edgebal mentioned in issue #1803 10 minutes ago

              mentioned in issue #1803

            • 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
            Emiliano Balbuena's avatar Emiliano Balbuena @edgebal
            Assign to
            sprint: Lucky Lizard
            Milestone
            sprint: Lucky Lizard
            Assign milestone
            None
            Time tracking
            No estimate or time spent
            2
            Labels
            Product::Common Squad::Yellow
            Assign labels
            • View project labels
            Lock merge request
            Unlocked
            9
            9 participants
            user avatar
            Martin Santangelo
            user avatar
            Brian Hatchet
            user avatar
            Olivia Madrid
            user avatar
            Ben Hayward
            user avatar
            Guy Thouret
            user avatar
            Marcelo Rivera
            user avatar
            Juan Manuel Solaro
            Reference: minds/front!516