aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16029 from cade/fix_typo_in_commentVijay Dev2014-07-031-1/+1
|\ | | | | Fix typo in comment
| * Fix typo in commentCade Truitt2014-07-021-1/+1
|/
* Merge pull request #16026 from lucasmazza/lm-respond-to-jsonp-fixRafael Mendonça França2014-07-023-1/+24
|\ | | | | Change the JSON renderer to enforce the 'JS' Content Type
| * Change the JSON renderer to enforce the 'JS' Content TypeLucas Mazza2014-07-023-1/+24
| | | | | | | | | | | | | | The controller can set the response format as 'JSON' before the renderer code be evaluated, so we must replace it when necessary. Fixes #15081
* | Add CHANGELOG for c803b90Godfrey Chan2014-07-021-0/+4
| |
* | The hex escape sequence can be of any lengthGodfrey Chan2014-07-021-1/+1
| |
* | Fix escape_once double-escaping hex-encoded entitiesJohn F. Douthat2014-07-023-1/+3
| | | | | | | | (This is a manual merge of #9102)
* | Only automatically include validations when enabledGodfrey Chan2014-07-022-12/+5
| | | | | | | | This is a follow up to #16024.
* | Merge pull request #16001 from johnpaulashenfelter/jp_fix_datetime_to_fGodfrey Chan2014-07-023-2/+10
|\ \ | |/ |/| | | `DateTime#to_f` now preserves fractional seconds.
| * `DateTime#to_f` now preserves fractional seconds.John Paul Ashenfelter2014-07-023-2/+10
|/ | | | | | | Previously this method always returns `.0` in the fractional part. This commit changes it to preserve the fractional seconds instead. Fixes #15994.
* Merge pull request #16024 from aditya-kapoor/include-validationsRafael Mendonça França2014-07-024-2/+6
|\ | | | | automatically include ActiveModel::Validations when include ActiveModel::SecurePassword
| * automatically include ActiveModel::Validations when include ↵Aditya Kapoor2014-07-034-2/+6
| | | | | | | | ActiveModel::SecurePassword
* | Merge pull request #16015 from sgrif/sg-ensure-initializedRafael Mendonça França2014-07-022-4/+7
|\ \ | |/ |/| | | | | | | | | Move pk initialization logic onto `AttributeSet` Conflicts: activerecord/lib/active_record/attribute_set.rb
| * Move pk initialization logic onto `AttributeSet`Sean Griffin2014-07-022-4/+7
| | | | | | | | Better encapsulates its internals from `ActiveRecord::Base`.
* | Merge pull request #16022 from sgrif/sg-range-quotingRafael Mendonça França2014-07-023-2/+19
|\ \ | | | | | | Quote range strings when quoting PG ranges
| * | Quote range strings when quoting PG rangesSean Griffin2014-07-023-2/+19
|/ / | | | | | | | | The test case for CVE-2014-3483 doesn't actually send the generated SQL to the database. The generated SQL is actually invalid for real inputs.
* | Fix SQL injection when querying against ranges and bitstringsRafael Mendonça França2014-07-023-4/+16
| | | | | | | | Fix CVE-2014-3483 and protect against CVE-2014-3482.
* | Fix typoRafael Mendonça França2014-07-021-1/+1
| |
* | Merge pull request #16016 from sgrif/sg-dupRafael Mendonça França2014-07-023-2/+19
|\ \ | | | | | | Don't error when `dup`ing a record with no PK
| * | Don't error when `dup`ing a record with no PKSean Griffin2014-07-023-2/+19
| |/
* | Merge pull request #16007 from nishantmodak/flash_msg_as_stringRafael Mendonça França2014-07-021-3/+6
|\ \ | |/ |/| flash doesn't pass objects #15522 [ci skip]
| * flash doesn't pass objects #15522 [ci skip]Nishant Modak2014-07-011-3/+6
| |
* | Revert "Merge pull request #15394 from ↵Rafael Mendonça França2014-07-024-105/+3
| | | | | | | | | | | | | | | | | | | | morgoth/fix-automatic-maintaining-test-schema-for-sql-format" This reverts commit 46139d33c06715e74ad450428ece3ee84da98579, reversing changes made to 8f247871bb18b2e3036a05df5f62cbfe3b402586. Conflicts: activerecord/CHANGELOG.md
* | Tiny follow-up to #15987 and 088b4c3e [ci skip]Robin Dupret2014-07-021-4/+4
| |
* | do not hold on to a stale connection object. fixes #15998Aaron Patterson2014-07-012-6/+14
| |
* | Merge pull request #15999 from ↵Rafael Mendonça França2014-07-011-0/+32
|\ \ | |/ |/| | | | | eileencodes/add-regression-tests-for-keys-on-nested-associations Add regression tests for keys on nested associations
| * Add regression tests for keys on nested associationseileencodes2014-07-011-0/+32
| | | | | | | | | | | | This adds the regressions tests from issue #15893 to master. It's checking that both strings and symbols are accepted as keys for nested associations.
* | Merge pull request #16006 from ShunsukeAida/xml_http_request_comment_changeRafael Mendonça França2014-07-011-2/+2
|\ \ | | | | | | [ci skip] Fixed the documentation of xml_http_request? (aka xhr?)
| * | makes it sound less misleadingShunsukeAida2014-07-021-2/+2
| | |
* | | Rename preview_enabled option to show_previewsRafael Mendonça França2014-07-016-20/+20
| | |
* | | Merge pull request #15970 from ↵Rafael Mendonça França2014-07-017-3/+80
|\ \ \ | |/ / |/| | | | | | | | | | | lengarvey/add_configuration_option_for_mail_preview Add configuration to enable mail previews
| * | Add configuration to enable mail previewsLeonard Garvey2014-07-017-3/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `config.action_mailer.preview_enabled` This allows mail previewing to be enabled easily in non-development environments such as staging. The default is set to true for development so no changes should be required to existing Rails applications. The mail preview path can still be configured using the existing `config.action_mailer.preview_path` configuration option. Adding this avoids devs from having to do stuff like: https://gist.github.com/lengarvey/fa2c9bd6cdbeba96526a Update actionmailer/CHANGELOG with new configuration. Update configuring guide with new configuratation. Add `config.action_mailer.preview_path` to configuring guide.
* | | Merge pull request #16000 from sgrif/sg-silence-warningMatthew Draper2014-07-021-0/+1
|\ \ \ | | | | | | | | Silence warning emitted in tests
| * | | Silence warning emitted in testsSean Griffin2014-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | The instance method `model_name` was being defined multiple times, causing a redefinition warning.
* | | | Merge pull request #16004 from JuanitoFatas/doc/patch-1Rafael Mendonça França2014-07-011-0/+2
|\ \ \ \ | |/ / / |/| | | [ci skip] Add missing prologue section of upgrading ruby on rails guide.
| * | | [ci skip] Add missing prologue section of upgrading ruby on rails guide.Juanito Fatas2014-07-011-0/+2
| | |/ | |/|
* | | Merge pull request #15997 from cirosantilli/typoEileen M. Uchitelle2014-07-011-1/+1
|\ \ \ | |/ / |/| | Fix doc unwanted dl Admin:: [ci skip]
| * | Fix doc unwanted dl Admin:: [ci skip]Ciro Santilli2014-07-011-1/+1
|/ /
* | push host / port / protocol extraction upAaron Patterson2014-06-301-6/+6
| | | | | | | | Then we only need to extract host once.
* | Add CHANGELOG entry for #15214Rafael Mendonça França2014-06-301-0/+4
| | | | | | | | Closes #15214
* | Use if/elseRafael Mendonça França2014-06-301-2/+5
| | | | | | | | | | Since we are using both branches of the code is preferable to use if/else over the early return.
* | Merge pull request #15214 from todd/date_field_docsRafael Mendonça França2014-06-303-2/+119
|\ \ | | | | | | | | | Added String support for min and max properties for date field helpers
| * | Add String support for min/max attributes on DatetimeFieldTodd Bealmear2014-06-303-2/+119
|/ /
* | Rename rollback_changes to undo_changesRafael Mendonça França2014-06-303-6/+6
| | | | | | | | To avoid overload with database rollback
* | Add CHANGELOG entry for #14861 and document private methods on the APIRafael Mendonça França2014-06-302-5/+10
| |
* | Merge pull request #14861 from igor04/dirty-rollbackRafael Mendonça França2014-06-302-0/+35
|\ \ | | | | | | | | | Added rollback method to ActiveModel::Dirty
| * | Added rollback method to ActiveModel::Dirtyigor042014-06-232-0/+35
| | |
* | | Merge pull request #15991 from sgrif/sg-has-attributeRafael Mendonça França2014-06-301-6/+1
|\ \ \ | | | | | | | | Don't add a second method for attribute existence
| * | | Don't add a second method for attribute existenceSean Griffin2014-06-301-6/+1
|/ / / | | | | | | | | | | | | We already had one in the public API that people can use more easily for the transition
* | | Merge pull request #15989 from nickpellant/masterRafael Mendonça França2014-06-301-1/+1
|\ \ \ | | | | | | | | Fix 10.3 invite_email.body assert_match documentation example.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 03:47:36 +0000