Merge branch 'master' into rubinius18

* master: Allow running in production mode on dev machine Fix UserMailer to work in 1.8 mode Conflicts: app/views/layouts/application.html.erb
13 years ago · 95cbc4a52f
parent 72526f3e1d 6b53a25f0a
commit 95cbc4a52f
3 changed files with 12 additions and 7 deletions
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@ -1,5 +1,5 @@
 class UserMailer < ActionMailer::Base
-  default from: "ascii.io <hello@ascii.io>"
+  default :from => "ascii.io <hello@ascii.io>"

  def new_comment_email(user, comment)
    @comment = comment
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@ -3,7 +3,7 @@
  <head>
    <meta charset="utf-8">
    <title><% if @title %><%= @title + " - " %><% end %>ascii.io</title>
-    <%= airbrake_javascript_notifier %>
+    <%= airbrake_javascript_notifier unless CFG.airbrake_api_key.blank? %>
    <%= csrf_meta_tags %>

    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
--- a/config/initializers/errbit.rb
+++ b/config/initializers/errbit.rb
@ -1,7 +1,12 @@
 Airbrake.configure do |config|
-  config.api_key     = CFG.airbrake_api_key
-  config.host        = CFG.airbrake_host
-  config.port        = 80
-  config.secure      = config.port == 443
-  config.development_environments = ['development', 'bugfix']
+  unless CFG.airbrake_api_key.blank?
+    config.api_key     = CFG.airbrake_api_key
+    config.host        = CFG.airbrake_host
+    config.port        = 80
+    config.secure      = config.port == 443
+  end
+
+  envs = ['development', 'bugfix']
+  envs << Rails.env if CFG.airbrake_api_key.blank?
+  config.development_environments = envs
 end