| Commit message (Expand) | Author | Age | Files | Lines |
* | Add test to ensure data attributes are properly escaped with tag helpers | Carlos Antonio da Silva | 2012-11-01 | 1 | -2/+7 |
* | Merge pull request #8092 from arunagw/warning_removed_unused_var | Santiago Pastorino | 2012-10-31 | 1 | -1/+1 |
|\ |
|
| * | Small change to remove warning unused variable. | Arun Agrawal | 2012-11-01 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #8026 from steveklabnik/issue_8025 | Carlos Antonio da Silva | 2012-10-31 | 2 | -1/+6 |
|\ |
|
| * | Make sure that RAILS_ENV is set when accessing Rails.env | Steve Klabnik | 2012-10-31 | 2 | -1/+6 |
|/ |
|
* | Revert "Don't allocate new strings in compiled attribute methods" | David Heinemeier Hansson | 2012-10-31 | 2 | -39/+20 |
* | No need for the debugger | David Heinemeier Hansson | 2012-10-31 | 1 | -1/+0 |
* | Allow #permit to take its list of permitted parameters as an array | David Heinemeier Hansson | 2012-10-31 | 2 | -1/+6 |
* | Revert "if format is unknown NullMimeTypeObject is returned" | Guillermo Iguaran | 2012-10-31 | 3 | -28/+2 |
* | Remove extre count, preheat already happens during setup | Carlos Antonio da Silva | 2012-10-31 | 1 | -1/+0 |
* | Merge pull request #8073 from alexisbernard/fix_find_in_batches_start_option | Carlos Antonio da Silva | 2012-10-31 | 3 | -2/+15 |
|\ |
|
| * | Fix find_in_batches against string IDs when start option is not specified. | Alexis Bernard | 2012-10-31 | 3 | -2/+15 |
|/ |
|
* | Merge pull request #8084 from acapilleri/format_never_nil | Rafael Mendonça França | 2012-10-31 | 3 | -2/+28 |
|\ |
|
| * | if format is unknown NullMimeTypeObject is returned | Angelo capilleri | 2012-10-31 | 3 | -2/+28 |
|/ |
|
* | Merge pull request #8078 from nikitug/serialized_attributes_before_type_cast | Carlos Antonio da Silva | 2012-10-31 | 3 | -3/+27 |
|\ |
|
| * | Fix `attributes_before_type_cast` for serialised attributes. | Nikita Afanasenko | 2012-10-31 | 3 | -3/+27 |
|/ |
|
* | Merge pull request #8074 from kennyj/fix_6951 | Rafael Mendonça França | 2012-10-30 | 3 | -6/+22 |
|\ |
|
| * | Fix #6951. Use query cache/uncache, when using not only database.yml but also... | kennyj | 2012-10-31 | 3 | -6/+22 |
|/ |
|
* | Revert "Support `Mailer.deliver_foo(*args)` as a synonym for `Mailer.foo(*arg... | Jon Leighton | 2012-10-30 | 3 | -15/+0 |
* | Revert "The debugger gem isn't compatible with 1.9.3-p286 yet. Omit it for now." | Santiago Pastorino | 2012-10-30 | 1 | -1/+1 |
* | Merge pull request #8072 from kennyj/remove_mattr_include_root_in_json | Carlos Antonio da Silva | 2012-10-30 | 2 | -1/+16 |
|\ |
|
| * | include_root_in_json allows inheritance. | kennyj | 2012-10-31 | 2 | -1/+16 |
* | | Merge pull request #6107 from gazay/make_caller_attribute_in_deprecation_opti... | Carlos Antonio da Silva | 2012-10-30 | 37 | -56/+59 |
|\| |
|
| * | Make caller attribute in deprecation methods optional | Alexey Gaziev | 2012-10-30 | 37 | -56/+59 |
|/ |
|
* | Remove not assigned variable warning from sqlite3 adapter test | Carlos Antonio da Silva | 2012-10-29 | 1 | -1/+1 |
* | Fix bug when Column is trying to type cast boolean values to integer. | Rafael Mendonça França | 2012-10-29 | 2 | -6/+17 |
* | Merge pull request #8066 from cfabianski/AddTestForSerializationMethod | Carlos Antonio da Silva | 2012-10-29 | 1 | -0/+9 |
|\ |
|
| * | Add test for code change introduced in this commit f20032f | Cédric FABIANSKI | 2012-10-29 | 1 | -0/+9 |
|/ |
|
* | Fix failing tests and use new hash style in deprecation messages | Carlos Antonio da Silva | 2012-10-29 | 6 | -28/+28 |
* | Merge pull request #8063 from nikitug/deprecation_caller_context | Carlos Antonio da Silva | 2012-10-29 | 27 | -55/+88 |
|\ |
|
| * | Provide a call stack for deprecation warnings where needed. | Nikita Afanasenko | 2012-10-29 | 27 | -55/+88 |
* | | Fix deprecation message in test for Path#children | Carlos Antonio da Silva | 2012-10-29 | 1 | -1/+1 |
|/ |
|
* | Add test to deprecation of Path#children | Rafael Mendonça França | 2012-10-29 | 1 | -0/+6 |
* | Merge pull request #7587 from elia/fix-too-eager-loading | Rafael Mendonça França | 2012-10-29 | 3 | -6/+17 |
* | Merge pull request #8027 from daenney/master | Xavier Noria | 2012-10-29 | 3 | -3/+12 |
|\ |
|
| * | atomicc.rb: Don't assume we may chown/chmod a file. | Daniele Sluijters | 2012-10-29 | 3 | -3/+12 |
|/ |
|
* | Fix the skip code. | Rafael Mendonça França | 2012-10-28 | 1 | -4/+4 |
* | Merge pull request #8057 from frodsan/fix_sqlite_mutate_arg | Rafael Mendonça França | 2012-10-28 | 2 | -1/+7 |
|\ |
|
| * | SQLite3Adapter#type_cast should not mutate arguments | Stefan Rusterholz | 2012-10-28 | 2 | -1/+7 |
|/ |
|
* | Merge pull request #7750 from xuanxu/none_modificating_relation_in_place | Rafael Mendonça França | 2012-10-28 | 4 | -0/+25 |
|\ |
|
| * | ActiveRecord::Relation#none! method. | Juanjo Bazán | 2012-10-28 | 3 | -0/+16 |
| * | loaded relations cannot be mutated by extending! | Juanjo Bazán | 2012-10-28 | 1 | -0/+9 |
|/ |
|
* | Merge pull request #8053 from henrik/update_columns_with_primary_key | Carlos Antonio da Silva | 2012-10-28 | 3 | -1/+20 |
|\ |
|
| * | Enable update_column(s) for the primary key attribute. | Henrik N | 2012-10-28 | 3 | -1/+20 |
|/ |
|
* | Merge pull request #8046 from pmahoney/exceptions_as_flow_control | Rafael Mendonça França | 2012-10-28 | 1 | -2/+2 |
|\ |
|
| * | Replace flow-control exception with explicit test. | Patrick Mahoney | 2012-10-27 | 1 | -2/+2 |
* | | Merge pull request #8048 from senny/7761_dont_render_view_without_mail_call | Rafael Mendonça França | 2012-10-28 | 5 | -1/+28 |
|\ \ |
|
| * | | Do not render views when mail() isn't called. (NullMail refactoring) | Yves Senn | 2012-10-28 | 5 | -1/+28 |
| |/ |
|
* | | Merge pull request #8047 from arunagw/json_only_in_18 | Carlos Antonio da Silva | 2012-10-28 | 1 | -1/+0 |
* | | Fix some assert_raise calls containing messages in Active Support | Carlos Antonio da Silva | 2012-10-28 | 2 | -7/+15 |