Skip to content

Commit

Permalink
resolved some reviewed suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
eacaps committed Jul 22, 2016
1 parent 9b958fb commit 840bc62
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/helpers/react_on_rails_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ def initialize_redux_stores
def rails_context(server_side:)
@rails_context ||= begin
result = {}
unless request.nil?
if request.present?
# Using Addressable instead of standard URI to better deal with
# non-ASCII characters (see https://github.com/shakacode/react_on_rails/pull/405)
uri = Addressable::URI.parse(request.original_url)
Expand Down
1 change: 0 additions & 1 deletion spec/dummy/app/mailers/dummy_mailer.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
class DummyMailer < ActionMailer::Base
add_template_helper(ReactOnRailsHelper)
default from: "nobody@nope.com"
# layout 'mailer'

def hello_email
mail(to: "otherperson@nope.com", subject: "you've got mail")
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/app/views/dummy_mailer/hello_email.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Someone emailed this to you:
helloWorldData: {
name: "Mr. Mailing Server Side Rendering"
}
}, prerender: true) %>
}, prerender: true) %>

0 comments on commit 840bc62

Please sign in to comment.