| Commit message (Expand) | Author | Age | Files | Lines |
* | remove .new from raise ActionController::UnknownFormat | Steven Soroka | 2012-05-06 | 1 | -1/+1 |
* | added an integration test that checks ActionController::UnknownFormat renders... | Steven Soroka | 2012-05-06 | 1 | -0/+9 |
* | Raise a rescuable exception when Rails doesn't know what to do with the forma... | Steven Soroka | 2012-05-06 | 4 | -15/+24 |
* | Merge pull request #6173 from mhfs/takes_instead_first | Jeremy Kemper | 2012-05-05 | 3 | -5/+17 |
|\ |
|
| * | Use `take` instead of `first` to avoid unwanted implicit ordering (fixes #6147) | Marcelo Silveira | 2012-05-05 | 3 | -5/+17 |
* | | Merge pull request #6069 from mipearson/use_strict_mode_in_mysql | Jeremy Kemper | 2012-05-05 | 6 | -1/+54 |
|\ \ |
|
| * | | Changelog entry regarding mysql(2) STRICT_ALL_TABLES | Michael Pearson | 2012-05-05 | 1 | -0/+6 |
| * | | Add config option, rdoc, tests for mysql(2) STRICT_ALL_TABLES mode. | Michael Pearson | 2012-05-05 | 4 | -4/+38 |
| * | | Default to 'strict mode' in MySQL | Michael Pearson | 2012-05-05 | 2 | -0/+11 |
| * | | Modify test schema.rb to use a VARCHAR rather than a TEXT when a default is r... | Michael Pearson | 2012-05-05 | 1 | -1/+3 |
* | | | Merge pull request #6054 from flexoid/column-fix | Jon Leighton | 2012-05-05 | 2 | -3/+31 |
|\ \ \ |
|
| * | | | Prevent creating valid time-like objects from blank string from db | Egor Lynko | 2012-05-05 | 2 | -3/+31 |
* | | | | Revert "Merge pull request #5494 from armstrjare/active_record_relation_keep_... | Jon Leighton | 2012-05-05 | 4 | -43/+6 |
|/ / / |
|
* | | | Merge pull request #5494 from armstrjare/active_record_relation_keep_associat... | Jon Leighton | 2012-05-05 | 4 | -6/+43 |
|\ \ \ |
|
| * | | | Allow ActiveRecord::Relation merges to maintain context of joined associations | Jared Armstrong | 2012-05-04 | 4 | -6/+43 |
* | | | | Make RedCloth not convert double hyphens to emdashes. Closes #5292 | Vijay Dev | 2012-05-06 | 1 | -0/+6 |
* | | | | Merge pull request #6176 from nashby/checkboxes | José Valim | 2012-05-05 | 2 | -1/+10 |
|\ \ \ \ |
|
| * | | | | check checkboxes with array of strings as :checked option | Vasiliy Ermolovich | 2012-05-05 | 2 | -1/+10 |
| | |_|/
| |/| | |
|
* | | | | some corrections in the AR query guide [ci skip] | Vijay Dev | 2012-05-05 | 1 | -13/+15 |
* | | | | Merge pull request #6175 from mhfs/guide_take_first_last | Vijay Dev | 2012-05-05 | 1 | -8/+42 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Update `first`, `last` and `take` in guides | Marcelo Silveira | 2012-05-05 | 1 | -8/+42 |
|/ / / |
|
* | | | Try to convert object passed to debug_hash to hash | Piotr Sarnacki | 2012-05-05 | 1 | -2/+2 |
* | | | Merge pull request #6169 from marcandre/respond_to_missing | José Valim | 2012-05-05 | 6 | -6/+24 |
|\ \ \
| |_|/
|/| | |
|
| * | | Use respond_to_missing for TimeWithZone | Marc-Andre Lafortune | 2012-05-05 | 2 | -3/+4 |
| * | | Use respond_to_missing? for Chars | Marc-Andre Lafortune | 2012-05-05 | 2 | -2/+11 |
| * | | Use respond_to_missing? for OrderedOptions | Marc-Andre Lafortune | 2012-05-05 | 2 | -1/+9 |
* | | | Give more detailed instructions in script/rails in engine | Piotr Sarnacki | 2012-05-04 | 1 | -0/+4 |
* | | | Duplicate column_defaults properly (closes #6115) | Piotr Sarnacki | 2012-05-04 | 3 | -2/+12 |
* | | | Change unless + ! into if | Piotr Sarnacki | 2012-05-04 | 1 | -1/+1 |
* | | | Merge pull request #3713 from kf8a/master | Aaron Patterson | 2012-05-04 | 2 | -2/+19 |
|\ \ \ |
|
| * | | | postgresql adapter handles quoting of not a number (NaN) and Infinity | Sven Bohm | 2011-11-21 | 2 | -2/+19 |
* | | | | need to dup the default options so that mutations will not impact us | Aaron Patterson | 2012-05-04 | 1 | -1/+1 |
* | | | | make sure the superclass matches so load order does not matter | Aaron Patterson | 2012-05-04 | 2 | -2/+2 |
* | | | | Merge pull request #6156 from mjtko/feature-beginning_of_hour | Jeremy Kemper | 2012-05-04 | 5 | -0/+56 |
|\ \ \ \ |
|
| * | | | | added beginning_of_hour support to core_ext calculations for Time and DateTime | Mark J. Titorenko | 2012-05-04 | 5 | -0/+56 |
* | | | | | Merge pull request #6163 from carlosantoniodasilva/wrap-params-refactor | Jeremy Kemper | 2012-05-04 | 1 | -1/+1 |
|\ \ \ \ \ |
|
| * | | | | | Use Hash#fetch instead of has_key? check | Carlos Antonio da Silva | 2012-05-04 | 1 | -1/+1 |
* | | | | | | Merge pull request #6157 from mjtko/fix-activesupport-time_with_zone-tests | Andrew White | 2012-05-04 | 1 | -8/+8 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | enable tests for beginning_of_* and end_of_* within time zone tests; enable t... | Mark J. Titorenko | 2012-05-04 | 1 | -8/+8 |
| |/ / / / |
|
* | | | | | Merge pull request #4445 from nragaz/role_based_params_wrapping | José Valim | 2012-05-04 | 2 | -4/+18 |
* | | | | | Merge pull request #5808 from avakhov/assert-template-layout-improve | José Valim | 2012-05-04 | 3 | -6/+60 |
|\ \ \ \ \ |
|
| * | | | | | Improve assert_template layout checking | Alexey Vakhov | 2012-05-04 | 2 | -3/+30 |
| * | | | | | Fix assert_template :layout => nil assertion | Alexey Vakhov | 2012-05-04 | 2 | -2/+17 |
| * | | | | | Fix assert_template assertion with :layout option | Alexey Vakhov | 2012-05-04 | 3 | -1/+13 |
|/ / / / / |
|
* | | | | | Merge pull request #6160 from carlosantoniodasilva/resource-route-canonical-a... | Aaron Patterson | 2012-05-04 | 3 | -5/+13 |
|\ \ \ \ \ |
|
| * | | | | | Force given path to http methods in mapper to skip canonical action checking | Carlos Antonio da Silva | 2012-05-04 | 3 | -5/+13 |
* | | | | | | fix doc [ci skip] | Vijay Dev | 2012-05-04 | 1 | -1/+1 |
* | | | | | | session creation methods to a module | Aaron Patterson | 2012-05-04 | 3 | -24/+11 |
* | | | | | | Merge pull request #6154 from shaliko/patch-1 | Vijay Dev | 2012-05-04 | 1 | -1/+6 |
|\ \ \ \ \ \
| |/ / / / /
|/| | | | | |
|
| * | | | | | Update documentation for button_to. | Shalva Usubov | 2012-05-04 | 1 | -1/+6 |
| |/ / / / |
|