Skip to content

Commit

Permalink
Use angular-ui-bootstrap from bower, not gem
Browse files Browse the repository at this point in the history
For some reason we still used the gem, but the version was fixed to one incompatible with current angular-patternfly.

Dropping the gem dependency and updating application.js to use the bower one.
  • Loading branch information
himdel committed Mar 29, 2017
1 parent c06e0a7 commit bd3ace7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
5 changes: 2 additions & 3 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//= require angular
//= require angular-drag-and-drop-lists
//= require angular-patternfly-sass/dist/angular-patternfly
//= require angular-ui-bootstrap
//= require angular-ui-bootstrap-tpls
//= require angular-bootstrap/ui-bootstrap
//= require angular-bootstrap/ui-bootstrap-tpls
//= require angular-sanitize
//= require angular.validators
//= require moment
Expand Down Expand Up @@ -49,7 +49,6 @@
//= require bootstrap-select
//= require bootstrap-hover-dropdown
//= require bootstrap-switch
//= require angular-ui-bootstrap
//= require angular-bootstrap-switch
//= require angular-ui-codemirror
//= require patternfly-bootstrap-treeview
Expand Down
1 change: 0 additions & 1 deletion manageiq-ui-classic.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ Gem::Specification.new do |s|

s.add_dependency "rails", "~> 5.0.0", ">= 5.0.0.1"

s.add_dependency "angular-ui-bootstrap-rails", "~>0.13.0"
s.add_dependency "coffee-rails"
s.add_dependency "jquery-hotkeys-rails"
s.add_dependency "lodash-rails", "~>3.10.0"
Expand Down

0 comments on commit bd3ace7

Please sign in to comment.