aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | 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 TypeLucas Mazza2014-07-023-1/+24
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | 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
* | | | | | | | | | Only automatically include validations when enabledGodfrey Chan2014-07-022-12/+5
* | | | | | | | | | Merge pull request #16001 from johnpaulashenfelter/jp_fix_datetime_to_fGodfrey Chan2014-07-023-2/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | `DateTime#to_f` now preserves fractional seconds.John Paul Ashenfelter2014-07-023-2/+10
|/ / / / / / / / /
* | | | | | | | | Merge pull request #16024 from aditya-kapoor/include-validationsRafael Mendonça França2014-07-024-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | automatically include ActiveModel::Validations when include ActiveModel::Secu...Aditya Kapoor2014-07-034-2/+6
* | | | | | | | | | Merge pull request #16015 from sgrif/sg-ensure-initializedRafael Mendonça França2014-07-022-4/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Move pk initialization logic onto `AttributeSet`Sean Griffin2014-07-022-4/+7
* | | | | | | | | | Merge pull request #16022 from sgrif/sg-range-quotingRafael Mendonça França2014-07-023-2/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Quote range strings when quoting PG rangesSean Griffin2014-07-023-2/+19
|/ / / / / / / / / /
* | / / / / / / / / Fix SQL injection when querying against ranges and bitstringsRafael Mendonça França2014-07-023-4/+16
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | 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 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]Nishant Modak2014-07-011-3/+6
* | | | | | | | | Revert "Merge pull request #15394 from morgoth/fix-automatic-maintaining-test...Rafael Mendonça França2014-07-024-105/+3
* | | | | | | | | 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 eileencodes/add-regression-tests-for-keys-on-n...Rafael Mendonça França2014-07-011-0/+32
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add regression tests for keys on nested associationseileencodes2014-07-011-0/+32
* | | | | | | | Merge pull request #16006 from ShunsukeAida/xml_http_request_comment_changeRafael Mendonça França2014-07-011-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 lengarvey/add_configuration_option_for_mail_pr...Rafael Mendonça França2014-07-017-3/+80
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add configuration to enable mail previewsLeonard Garvey2014-07-017-3/+80
* | | | | | | | | Merge pull request #16000 from sgrif/sg-silence-warningMatthew Draper2014-07-021-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Silence warning emitted in testsSean Griffin2014-07-011-0/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | 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.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]Ciro Santilli2014-07-011-1/+1
|/ / / / / / /
* | | | | | | push host / port / protocol extraction upAaron Patterson2014-06-301-6/+6
* | | | | | | Add CHANGELOG entry for #15214Rafael Mendonça França2014-06-301-0/+4
* | | | | | | Use if/elseRafael Mendonça França2014-06-301-2/+5
* | | | | | | Merge pull request #15214 from todd/date_field_docsRafael Mendonça França2014-06-303-2/+119
|\ \ \ \ \ \ \
| * | | | | | | 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
* | | | | | | 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::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 existenceSean Griffin2014-06-301-6/+1
|/ / / / / / /
* | | | | | | Merge pull request #15989 from nickpellant/masterRafael Mendonça França2014-06-301-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix 10.3 invite_email.body assert_match example.Nick Pellant2014-06-301-1/+1
|/ / / / / / /