Commit Graph

14 Commits

Author SHA1 Message Date
Vasiliy Ermolovich
e29773f885 form_for with +:as+ option uses "action_as" as css class and id 2011-12-04 22:12:24 +03:00
José Valim
07f90f6bec Merge branch 'exceptions' with the following features:
* A Railtie API for registering new exceptions and their respective status code (check Active Record railtie for an example)

* Extraction of ShowExceptions middleware logging and debugging features into a middleware called DebugExceptions

Conflicts:
	actionpack/CHANGELOG.md
2011-12-01 21:18:47 +01:00
José Valim
b4359bc723 Allow rescue responses to be configured through a railtie. 2011-12-01 19:21:35 +01:00
David Heinemeier Hansson
218c272938 Allow fresh_when/stale? to take a record instead of an options hash [DHH] 2011-12-01 19:16:10 +01:00
José Valim
1e51cd957e Update CHANGELOG. 2011-12-01 13:22:28 +01:00
José Valim
38ab982cff Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time a before callback halts. 2011-11-30 09:53:09 +01:00
Vasiliy Ermolovich
2559256963 update CHANGELOG 2011-11-28 10:54:12 +03:00
lest
3a1d51959b deprecation warning, changelog entry 2011-11-22 17:36:58 +03:00
Jon Leighton
603a679e87 Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685. 2011-11-19 13:28:07 +00:00
lest
e8d57f361a _html translation should escape interpolated arguments 2011-11-17 23:07:39 +00:00
Jon Leighton
ca3b468937 Sync changelog entry 2011-11-14 12:23:43 +00:00
Jon Leighton
da02f792fe Sync CHANGELOGs from 3-1-stable 2011-11-14 11:28:12 +00:00
Jon Leighton
fc988115f7 Implement a workaround for a bug in ruby-1.9.3p0.
The bug is that an error would be raised while attempting to convert a
template from one encoding to another.

Please see http://redmine.ruby-lang.org/issues/5564 for more details.

The workaround is to load all conversions into memory ahead of time,
and will only happen if the ruby version is *exactly* 1.9.3p0. The
hope is obviously that the underlying problem will be resolved in
the next patchlevel release of 1.9.3.
2011-11-06 10:40:00 +00:00
Jon Leighton
281272ad36 Convert CHANGELOGs to Markdown format.
Reasons:

 * Markdown reads well as plain text, but can also be formatted.
 * It will make it easier for people to read on the web as Github
   formats the Markdown nicely.
 * It will encourage a level of consistency when people are writing
   CHANGELOG entries.

The script used to perform the conversion is at
https://gist.github.com/1339263
2011-11-04 12:55:17 +00:00