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 817
    • Issues 817
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 69
    • Merge Requests 69
  • 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
  • !382

Closed
Opened 4 days ago by Marcelo Rivera@eiennohi
  • Report abuse
Report abuse

[Sprint/HipsterHedgehog] (feat): upgrade to angular 8.0.4

closes #1449

Check out, review, and merge locally

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

git fetch https://gitlab.com/eiennohi/front.git sprint/HipsterHedgehog.feat.update-to-angular-8
git checkout -b eiennohi/front-sprint/HipsterHedgehog.feat.update-to-angular-8 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 eiennohi/front-sprint/HipsterHedgehog.feat.update-to-angular-8

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 eiennohi:sprint/HipsterHedgehog.feat.update-to-angular-8 into master
  • Email patches
  • Plain diff
Pipeline #68368809 passed for 87d498db on eiennohi:sprint/HipsterHedgehog.feat.update-to-angular-8
    Merge request approved. Approved by
    Mark Harding
    Mark Harding
    Ben Hayward
    Ben Hayward
    Emiliano Balbuena
    Emiliano Balbuena
    Brian Hatchet
    Brian Hatchet
    Martin Santangelo
    Martin Santangelo

    Closed by Mark Harding 1 hour ago

    The changes were not merged into master

    Allows commits from members who can merge to the target branch

    Did not close #1449

    Deletes source branch

    • Discussion 2
    • Commits 2
    • Pipelines 2
    • Changes 106
    • Loading...
    • Marcelo Rivera @eiennohi added 1 commit 4 days ago

      added 1 commit

      • 87d498db - (fix): spec test

      Compare with previous version

    • Emiliano Balbuena @edgebal approved this merge request 4 days ago

      approved this merge request

    • Ben Hayward
      Ben Hayward @benhayward.ben · 4 days ago
      Developer

      I get this when running yarn build-dev is this something locally on my end?

      image

    • Ben Hayward
      Ben Hayward @benhayward.ben · 4 days ago
      Developer

      Disregard, that was on my end

    • Ben Hayward @benhayward.ben approved this merge request 4 days ago

      approved this merge request

    • Mark Harding @markeharding approved this merge request 3 days ago

      approved this merge request

    • Mark Harding @markeharding added MR::Awaiting Review label 1 day ago

      added MR::Awaiting Review label

    • Mark Harding @markeharding closed 1 hour ago

      closed

    • 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
    1
    Labels
    MR::Awaiting Review
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    6
    6 participants
    user avatar
    Brian Hatchet
    user avatar
    Martin Santangelo
    user avatar
    Mark Harding
    user avatar
    Ben Hayward
    user avatar
    Marcelo Rivera
    user avatar
    Emiliano Balbuena
    Reference: minds/front!382