Archives
/
asciinema.org
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into rubinius18

Browse Source 
* master:
  Allow running in production mode on dev machine
  Fix UserMailer to work in 1.8 mode

Conflicts:
	app/views/layouts/application.html.erb
openid
Marcin Kulik 13 years ago
parent 72526f3e1d 6b53a25f0a
commit 95cbc4a52f
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
app/mailers/user_mailer.rb
Unescape Escape View File

@ -1,5 +1,5 @@
class UserMailer < ActionMailer::Base class UserMailer < ActionMailer::Base
default from: "ascii.io <hello@ascii.io>" default :from => "ascii.io <hello@ascii.io>"
def new_comment_email(user, comment) def new_comment_email(user, comment)
@comment = comment @comment = comment

2
app/views/layouts/application.html.erb
Unescape Escape View File

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title><% if @title %><%= @title + " - " %><% end %>ascii.io</title> <title><% if @title %><%= @title + " - " %><% end %>ascii.io</title>
<%= airbrake_javascript_notifier %> <%= airbrake_javascript_notifier unless CFG.airbrake_api_key.blank? %>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
<!-- Le HTML5 shim, for IE6-8 support of HTML elements --> <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->

15
config/initializers/errbit.rb
Unescape Escape View File

@ -1,7 +1,12 @@
Airbrake.configure do |config| Airbrake.configure do |config|
config.api_key = CFG.airbrake_api_key unless CFG.airbrake_api_key.blank?
config.host = CFG.airbrake_host config.api_key = CFG.airbrake_api_key
config.port = 80 config.host = CFG.airbrake_host
config.secure = config.port == 443 config.port = 80
config.development_environments = ['development', 'bugfix'] config.secure = config.port == 443
end
envs = ['development', 'bugfix']
envs << Rails.env if CFG.airbrake_api_key.blank?
config.development_environments = envs
end end

Write Preview
Loading…
Cancel
Save