Merge branch 'master' of git@github.com:rails/rails

rails · Feb 6, 2009 · a4790e9 · a4790e9
2 parents 34f34e3 + 10b6073
commit a4790e9
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 43 deletions.
diff --git a/railties/html/500.html b/railties/html/500.html
@@ -25,9 +25,6 @@
   <div class="dialog">
     <h1>We're sorry, but something went wrong.</h1>
     <p>We've been notified about this issue and we'll take a look at it shortly.</p>
-    <p><small>(If you're the administrator of this website, then please read
-    the log file "<%= "<%s>" % "%=h RAILS_ENV %" %>.log"
-    to find out what went wrong.)</small></p>
   </div>
 </body>
 </html>
diff --git a/railties/test/error_page_test.rb b/railties/test/error_page_test.rb