Skip to content

Commit 86b5260

Browse files
committed
Merge pull request #587 from marmelab/no_more_bower
[RFR] Bower is no longer necessary to the build
2 parents 641c903 + f3d5541 commit 86b5260

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ before_install:
1616
- "sh -e /etc/init.d/xvfb start"
1717
- gem update --system
1818
- gem install compass
19-
- "npm install -g grunt-cli bower"
19+
- "npm install -g grunt-cli"
2020
- "make"
2121
branches:
2222
only:

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.PHONY: build
22

33
install:
4-
bower install
54
npm install
65
./node_modules/protractor/bin/webdriver-manager update
76

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"style-loader": "^0.12.2",
8989
"superagent": "^0.18.2",
9090
"textangular": "^1.3.11",
91-
"ui-select": "angular-ui/ui-select#v0.12.0",
91+
"ui-select": "angular-ui/ui-select#271bf6a03078587c5afdb05f61e826573a13d348",
9292
"underscore": "^1.8.3",
9393
"url-loader": "^0.5.5",
9494
"webpack": "^1.9.4",

0 commit comments

Comments
 (0)