diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-08-28 11:36:56 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-08-28 11:36:56 +0100 |
| commit | 3e3945b2fafb9ccedfd9ff181c31b18f5d4cd0ce (patch) | |
| tree | cd86abce0ab9accbbbf24018961464590fa6bb39 /railties/html | |
| parent | 5db2f199aba9aa8d00adefa8237922ad684aca03 (diff) | |
| parent | 96c6fe084228d570dad80e3100830edb2bc0448d (diff) | |
| download | rails-3e3945b2fafb9ccedfd9ff181c31b18f5d4cd0ce.tar.gz rails-3e3945b2fafb9ccedfd9ff181c31b18f5d4cd0ce.tar.bz2 rails-3e3945b2fafb9ccedfd9ff181c31b18f5d4cd0ce.zip | |
Merge commit 'mainstream/master'
Conflicts:
activerecord/lib/active_record/associations/association_proxy.rb
activerecord/lib/active_record/callbacks.rb
activeresource/lib/active_resource/base.rb
Diffstat (limited to 'railties/html')
| -rw-r--r-- | railties/html/500.html | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/railties/html/500.html b/railties/html/500.html index 0e9c14f4c6..74142cb04a 100644 --- a/railties/html/500.html +++ b/railties/html/500.html @@ -25,6 +25,9 @@ <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>
\ No newline at end of file +</html> |