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

Update ui-components to 0.0.12 (dialog editor) #288

Merged
merged 1 commit into from Feb 7, 2017
Merged

Update ui-components to 0.0.12 (dialog editor) #288

merged 1 commit into from Feb 7, 2017

Conversation

himdel
Copy link
Contributor

@himdel himdel commented Feb 2, 2017

Depends on: ManageIQ/manageiq#13775

Just released manageiq-ui-components version 0.0.12, but we do have that ~ in the dependency, so suddenly we also need it's new dependencies.

Adding angular-dragdrop & angular-ui-sortable - dependencies of the new dialog editor.
And upgrading ui-components to 0.0.12 just to be explicit.

@dclarizio dclarizio self-assigned this Feb 2, 2017
@himdel himdel changed the title Fix missing dependencies caused by newer ui-components [WIP] Update ui-components to 0.0.12 (dialog editor) Feb 2, 2017
@himdel himdel added the wip label Feb 2, 2017
@miq-bot
Copy link
Member

miq-bot commented Feb 6, 2017

This pull request is not mergeable. Please rebase and repush.

adding angular-dragdrop & angular-ui-sortable
and upgrading ui-components to 0.0.12 to be explicit

also added a jquery conflict resolution, to prevent jquery 3 from getting installed
@miq-bot
Copy link
Member

miq-bot commented Feb 6, 2017

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

@himdel himdel changed the title [WIP] Update ui-components to 0.0.12 (dialog editor) Update ui-components to 0.0.12 (dialog editor) Feb 6, 2017
@himdel himdel added enhancement and removed bug labels Feb 6, 2017
@martinpovolny martinpovolny merged commit 3ddfc3d into ManageIQ:master Feb 7, 2017
@martinpovolny martinpovolny added this to the Sprint 54 Ending Feb 13, 2017 milestone Feb 7, 2017
@himdel himdel deleted the ui-components-12 branch February 7, 2017 09:45
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.

None yet

4 participants