Skip to content

Conversation

@spadgett
Copy link
Member

Avoids jQuery conflicts with bootstrap-switch 3.3.4.

Fixes #1301

@jwforres Opinion on this change? It might be right to remove the dependency altogether, but this works around the bower conflict.

Avoids jQuery conflicts with bootstrap-switch 3.3.4.
@spadgett spadgett requested a review from jwforres February 27, 2017 14:21
@spadgett
Copy link
Member Author

[test]

@openshift-bot
Copy link

Evaluated for origin web console test up to e3bc37d

@openshift-bot
Copy link

Origin Web Console Test Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_web_console/1113/) (Base Commit: a05779d)

@jwforres
Copy link
Member

I'm OK with merging this for now

@spadgett
Copy link
Member Author

I'm OK with merging this for now

Merging to unblock the queue. I'll open a follow on issue to look at removing the dependency.

[merge]

@openshift-bot
Copy link

openshift-bot commented Feb 27, 2017

Origin Web Console Merge Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_web_console/1113/) (Base Commit: a05779d)

@openshift-bot
Copy link

Evaluated for origin web console merge up to e3bc37d

@openshift-bot openshift-bot merged commit babedac into openshift:master Feb 27, 2017
@spadgett spadgett deleted the lock-bootstrap-switch-version branch February 27, 2017 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants