Skip to content
This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

updates to qunit 2 #1894

Merged
merged 5 commits into from
Nov 4, 2016
Merged

updates to qunit 2 #1894

merged 5 commits into from
Nov 4, 2016

Conversation

cmcculloh-kr
Copy link

@cmcculloh-kr cmcculloh-kr commented Oct 31, 2016 •
edited by swilliamset
Loading

  • pull down branch
  • delete node_modules
  • npm cache clean
  • npm install
  • bower install && bower update
  • grunt test

@cmcculloh-kr cmcculloh-kr added this to the 3.15.9 milestone Oct 31, 2016
swilliamset
swilliamset reviewed Nov 1, 2016
View reviewed changes
dist/css/fuelux.css
@@ -1173,56 +1174,7 @@ label.fuelux .checkbox-inline {
font-size: 64px;
position: relative;
width: 64px;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this branch based correctly? or have the loader changes not been merged yet?

@swilliamset swilliamset self-assigned this Nov 1, 2016
@swilliamset
Copy link
Contributor

Submitting a PR to your PR branch to possible resolve the travis fail

@swilliamset swilliamset mentioned this pull request Nov 2, 2016
Merged
@swilliamset
Copy link
Contributor

Removing the commonjs
https://github.com/ExactTarget/fuelux/blob/master/grunt/config/qunit.js#L34
makes travis happy helping reduce the scope of the problem.

Now what is the solution?

@swilliamset swilliamset force-pushed the GH1891---upgrade-to-qunit-2-to-support-mac-os-sierra branch 3 times, most recently from 65cfb17 to 12c456b Compare November 4, 2016 14:34
@swilliamset swilliamset closed this Nov 4, 2016
@swilliamset swilliamset deleted the GH1891---upgrade-to-qunit-2-to-support-mac-os-sierra branch November 4, 2016 19:38
@swilliamset swilliamset reopened this Nov 4, 2016
@swilliamset swilliamset force-pushed the GH1891---upgrade-to-qunit-2-to-support-mac-os-sierra branch from 62cbf99 to abb3514 Compare November 4, 2016 21:22
swilliamset
swilliamset approved these changes Nov 4, 2016
View reviewed changes
Copy link
Contributor

@swilliamset swilliamset left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reviewed it a couple times over now. travis is happy again.

@swilliamset swilliamset merged commit 4ea7e26 into ExactTarget:master Nov 4, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@swilliamset swilliamset swilliamset approved these changes

Assignees

@swilliamset swilliamset

Labels
Plumbing
Projects
None yet
Milestone
3.15.9
Development

Successfully merging this pull request may close these issues.
2 participants
@cmcculloh-kr @swilliamset