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 803
    • Issues 803
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 61
    • Merge Requests 61
  • 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
  • !442

Merged
Opened 2 hours ago by Guy Thouret@gthouret
  • Report abuse
Report abuse

(fix): Bump dev dependency version so native Mac build doesn't fail - fixes #1511

I bumped @angular-devkit/build-angular dev dependency from ~0.12.1 to ~0.13.9 to prevent npm install failing when pulling in node-sass 4.10.0 which doesn't build on Mac OS.

Check out, review, and merge locally

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

git fetch origin
git checkout -b fix/1511-native-mac-fail origin/fix/1511-native-mac-fail

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 fix/1511-native-mac-fail

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 fix/1511-native-mac-fail into master
  • Email patches
  • Plain diff
Pipeline #70298088 passed for 95c58c34 on fix/1511-native-mac-fail
          Merge request approved. Approved by
          Ben Hayward
          Ben Hayward
          Mark Harding
          Mark Harding
          Brian Hatchet
          Brian Hatchet
          Emiliano Balbuena
          Emiliano Balbuena
          Martin Santangelo
          Martin Santangelo
          Marcelo Rivera
          Marcelo Rivera

          Merged by Mark Harding 1 hour ago

          The changes were merged into master with 5d757256

          Closed #1511 (closed)

          Pipeline #70308658 passed for 5d757256 on master
                • Discussion 0
                • Commits 1
                • Pipelines 1
                • Changes 1
                • Loading...
                • Guy Thouret @gthouret added MR::Awaiting Review label 2 hours ago

                  added MR::Awaiting Review label

                • Mark Harding @markeharding approved this merge request 1 hour ago

                  approved this merge request

                • Ben Hayward @benhayward.ben approved this merge request 1 hour ago

                  approved this merge request

                • Mark Harding @markeharding merged 1 hour ago

                  merged

                • Mark Harding @markeharding mentioned in commit 5d757256 1 hour ago

                  mentioned in commit 5d757256

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

                Revert this merge request

                This will create a new commit in order to revert the existing changes.

                Switch branch
                Cancel
                A new branch will be created in your fork and a new merge request will be started.

                Cherry-pick this merge request

                Switch branch
                Cancel
                A new branch will be created in your fork and a new merge request will be started.