Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move jasmine dependency from manageiq, force 2.5.2 #1148

Merged
merged 1 commit into from
Apr 25, 2017
Merged

Move jasmine dependency from manageiq, force 2.5.2 #1148

merged 1 commit into from
Apr 25, 2017

Conversation

himdel
Copy link
Contributor

@himdel himdel commented Apr 25, 2017

jasmine 2.6.0 came out, breaking JS specs - we need to force 2.5* for now
and the dependency was still in manageiq, moving to ui-classic.

(The core dependency is because jasmine-core is the actual jasmine, but jasmine 2.5 depends on jasmine-core >2.5 <3.0 meaning it would pick up 2.6 anyway without this.)

This is the second part of ManageIQ/manageiq#14870 .. but this time, the UI PR needs to be merged first. (Euwe version in ManageIQ/manageiq#14871.)

jasmine 2.6.0 came out, breaking JS specs - we need to force 2.5* for now
aand the dependency was still in manageiq, moving to ui-classic.

(The core dependency is because jasmine-core is the actual jasmine, but jasmine 2.5 depends on jasmine-core >2.5 <3.0 meaning it would pick up 2.6 anyway without this.)
@miq-bot
Copy link
Member

miq-bot commented Apr 25, 2017

Checked commit https://github.com/himdel/manageiq-ui-classic/commit/9d023c2c2de48ef2f8e8f5d20c5614a87a755574 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
0 files checked, 0 offenses detected
Everything looks good. ⭐

@mzazrivec mzazrivec self-assigned this Apr 25, 2017
@mzazrivec mzazrivec added this to the Sprint 60 Ending May 8, 2017 milestone Apr 25, 2017
@mzazrivec mzazrivec merged commit f6bff09 into ManageIQ:master Apr 25, 2017
@himdel himdel deleted the jasmine branch April 25, 2017 10:23
simaishi pushed a commit that referenced this pull request Apr 25, 2017
Move jasmine dependency from manageiq, force 2.5.2
(cherry picked from commit f6bff09)
@simaishi
Copy link
Contributor

Fine backport details:

$ git log -1
commit c7852677713550a755d74d465be1545a927746f9
Author: Milan Zázrivec <[email protected]>
Date:   Tue Apr 25 12:23:35 2017 +0200

    Merge pull request #1148 from himdel/jasmine
    
    Move jasmine dependency from manageiq, force 2.5.2
    (cherry picked from commit f6bff095994cea22fcbbd3217911810284a7886a)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants