Merge pull request zendesk#66 from zendesk/grosser/env

.env
commandp · Aug 27, 2014 · 1dcd2b0 · 1dcd2b0
2 parents fd60900 + bfdd006
commit 1dcd2b0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.env.example b/.env.example
@@ -6,11 +6,11 @@ GITHUB_SECRET={fill me in}
 GITHUB_TOKEN={fill me in}
 GITHUB_ADMIN_TEAM={eg. owners}
 GITHUB_DEPLOY_TEAM={eg. developers}
-GITHUB_WEB_URL={optional, eg. github.com}
-GITHUB_API_URL={optional, eg. api.github.com}
-GOOGLE_CLIENT_ID={optional, fill me in}
-GOOGLE_CLIENT_SECRET={optional, fill me in}
-BYPASS_EMAIL={optional, email destination that is alerted about buddy_check bypasses}
-BYPASS_JIRA_EMAIL={optional, jira email destination that is alerted about buddy_check bypasses}
-BUDDY_CHECK_FEATURE={optional, set to 1 to enable buddy_check feature; 0 to disable}
-DEPLOY_MAX_MINUTES_PENDING={optional, set to 20 for max minutes a deploy is pending}
+# GITHUB_WEB_URL={optional, eg. github.com}
+# GITHUB_API_URL={optional, eg. api.github.com}
+# GOOGLE_CLIENT_ID={optional, fill me in}
+# GOOGLE_CLIENT_SECRET={optional, fill me in}
+# BYPASS_EMAIL={optional, email destination that is alerted about buddy_check bypasses}
+# BYPASS_JIRA_EMAIL={optional, jira email destination that is alerted about buddy_check bypasses}
+# BUDDY_CHECK_FEATURE={optional, set to 1 to enable buddy_check feature; 0 to disable}
+# DEPLOY_MAX_MINUTES_PENDING={optional, set to 20 for max minutes a deploy is pending}
diff --git a/config/initializers/00_dotenv.rb b/config/initializers/00_dotenv.rb
@@ -1 +1 @@
-Dotenv.load(Bundler.root.join('.env'))
+Dotenv.load(Bundler.root.join('.env')) unless Rails.env.test?
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Dotenv.load(Bundler.root.join('.env'))
		Dotenv.load(Bundler.root.join('.env')) unless Rails.env.test?