Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 16DF91071B for ; Tue, 26 Nov 2013 20:40:47 +0000 (UTC) Received: (qmail 52430 invoked by uid 500); 26 Nov 2013 20:40:46 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 52256 invoked by uid 500); 26 Nov 2013 20:40:46 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 52246 invoked by uid 99); 26 Nov 2013 20:40:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Nov 2013 20:40:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C009D918F77; Tue, 26 Nov 2013 20:40:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: deathbear@apache.org To: commits@couchdb.apache.org Date: Tue, 26 Nov 2013 20:40:46 -0000 Message-Id: <3ce1c3bda099445180ff541fe830216e@git.apache.org> In-Reply-To: <0db48d0880874eafb50c98b97e657615@git.apache.org> References: <0db48d0880874eafb50c98b97e657615@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/generate-root-from-settings to 753a748 set to "/" as default Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/753a7481 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/753a7481 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/753a7481 Branch: refs/heads/generate-root-from-settings Commit: 753a74816ed1b9f1b7fd1f0604a03c1d862ee590 Parents: c1188d8 Author: suelockwood Authored: Tue Nov 26 14:29:41 2013 -0500 Committer: suelockwood Committed: Tue Nov 26 14:29:41 2013 -0500 ---------------------------------------------------------------------- src/fauxton/tasks/fauxton.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/753a7481/src/fauxton/tasks/fauxton.js ---------------------------------------------------------------------- diff --git a/src/fauxton/tasks/fauxton.js b/src/fauxton/tasks/fauxton.js index e466c9f..f43546c 100644 --- a/src/fauxton/tasks/fauxton.js +++ b/src/fauxton/tasks/fauxton.js @@ -97,7 +97,7 @@ module.exports = function(grunt) { var settings = grunt.file.readJSON(settingsFile); var template = "app/initialize.js.underscore"; var dest = "app/initialize.js"; - var root = settings.root; + var root = settings.root || "/"; var tmpl = _.template(grunt.file.read(template)); grunt.file.write(dest, tmpl({root: root})); });