You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2016/04/13 16:48:02 UTC
[1/2] fauxton commit: updated refs/heads/master to 9e69377
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 40a023ced -> 9e6937767
fork mocha-phantomjs for now
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/33538c0b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/33538c0b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/33538c0b
Branch: refs/heads/master
Commit: 33538c0b4518eadf5271970fcca7d9fb663e8bf9
Parents: 40a023c
Author: Garren Smith <ga...@gmail.com>
Authored: Wed Apr 13 16:06:31 2016 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Wed Apr 13 16:06:31 2016 +0200
----------------------------------------------------------------------
.gitignore | 1 +
package.json | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/33538c0b/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 31f77c9..e92ef53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ selenium-debug.log
npm-debug.log
test/bundle.js
test/templates.js
+test/dashboard.assets
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/33538c0b/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 7b34d17..ee4c8df 100644
--- a/package.json
+++ b/package.json
@@ -18,9 +18,9 @@
"devDependencies": {
"es5-shim": "4.5.4",
"mocha": "^2.4.5",
- "mocha-phantomjs": "~4.0.2",
+ "mocha-phantomjs": "git@github.com:garrensmith/mocha-phantomjs.git",
"nightwatch": "~0.8.18",
- "phantomjs": "^2.0.1",
+ "phantomjs-prebuilt": "^2.1.7",
"react-addons-test-utils": "^0.14.7",
"sinon": "git+https://github.com/sinonjs/sinon.git"
},
[2/2] fauxton commit: updated refs/heads/master to 9e69377
Posted by ga...@apache.org.
http fetch
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/9e693776
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/9e693776
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/9e693776
Branch: refs/heads/master
Commit: 9e693776752556a5f17894d751e44c073b3b70a1
Parents: 33538c0
Author: Garren Smith <ga...@gmail.com>
Authored: Wed Apr 13 16:19:24 2016 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Wed Apr 13 16:19:24 2016 +0200
----------------------------------------------------------------------
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9e693776/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index ee4c8df..d9c60d1 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
"devDependencies": {
"es5-shim": "4.5.4",
"mocha": "^2.4.5",
- "mocha-phantomjs": "git@github.com:garrensmith/mocha-phantomjs.git",
+ "mocha-phantomjs": "git+https://github.com/garrensmith/mocha-phantomjs.git",
"nightwatch": "~0.8.18",
"phantomjs-prebuilt": "^2.1.7",
"react-addons-test-utils": "^0.14.7",