Permalink
Browse files

rdoc update

  • Loading branch information...
1 parent 3412470 commit 0baa061bab3a8ed2ba88518639a94c2e1468c59a @ambtus ambtus committed Sep 29, 2012
Showing with 240 additions and 240 deletions.
  1. +1 −1 doc/app/PasswordsController.html
  2. +239 −239 doc/app/created.rid
@@ -635,7 +635,7 @@ <h3 class="section-header">Public Instance Methods</h3>
<span class="ruby-identifier">setflash</span>; <span class="ruby-identifier">flash</span>[<span class="ruby-value">:notice</span>] = <span class="ruby-identifier">ts</span>(<span class="ruby-string">&quot;We couldn't find an account with that email address or username. Please try again?&quot;</span>)
<span class="ruby-identifier">render</span> <span class="ruby-value">:action</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-string">&quot;new&quot;</span>
<span class="ruby-keyword">elsif</span> <span class="ruby-operator">!</span><span class="ruby-ivar">@user</span>.<span class="ruby-identifier">active?</span>
- <span class="ruby-identifier">setflash</span>; <span class="ruby-identifier">flash</span>[<span class="ruby-value">:error</span>] = <span class="ruby-identifier">ts</span>(<span class="ruby-node">&quot;Your account has not been activated. Please check your email (including your spam folder) for the activation link or &lt;a href=\&quot;#{new_feedback_report_url}\&quot;&gt;contact Support&lt;/a&gt;.&quot;</span>.<span class="ruby-identifier">html_safe</span>)
+ <span class="ruby-identifier">setflash</span>; <span class="ruby-identifier">flash</span>.<span class="ruby-identifier">now</span>[<span class="ruby-value">:error</span>] = <span class="ruby-identifier">ts</span>(<span class="ruby-node">&quot;Your account has not been activated. Please check your email (including your spam folder) for the activation link or &lt;a href=\&quot;#{new_feedback_report_url}\&quot;&gt;contact Support&lt;/a&gt;.&quot;</span>.<span class="ruby-identifier">html_safe</span>)
<span class="ruby-identifier">render</span> <span class="ruby-value">:action</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-string">&quot;new&quot;</span>
<span class="ruby-keyword">else</span>
<span class="ruby-ivar">@user</span>.<span class="ruby-identifier">reset_user_password</span>
Oops, something went wrong.

0 comments on commit 0baa061

Please sign in to comment.