aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ / /
* | | Move STI docs off of the main Base document, leaving a noteSean Griffin2014-06-302-28/+34
* | | Merge pull request #15987 from jamesprior/patch-2Sean Griffin2014-06-301-0/+9
|\ \ \
| * | | Update documentation on STI change handlingjamesprior2014-06-301-0/+9
|/ / /
* | | Merge pull request #15981 from sgrif/sg-simplify-defaultsRafael Mendonça França2014-06-293-21/+9
|\ \ \
| * | | Simplify creation of default attributes on AR instanceSean Griffin2014-06-294-21/+10
* | | | Merge pull request #15977 from sgrif/sg-remove-array-hackGodfrey Chan2014-06-291-24/+0
|\ \ \ \
| * | | | Remove array workaround in PG quotingSean Griffin2014-06-291-24/+0
* | | | | Merge pull request #15978 from sgrif/sg-pg-array-memberGodfrey Chan2014-06-292-12/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove unused `array_member` from PG quoting for HStore columnsSean Griffin2014-06-292-12/+9
|/ / / /
* | | | Merge pull request #15983 from sgrif/sg-inline-pointGodfrey Chan2014-06-293-19/+9
|\ \ \ \
| * | | | Use the type object when sending point columns to the DBSean Griffin2014-06-293-19/+9
* | | | | Merge pull request #15976 from sgrif/sg-attribute-existsGodfrey Chan2014-06-291-2/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Don't encourage usage of `columns_hash`Sean Griffin2014-06-291-2/+7
* | | | | Merge pull request #15982 from sgrif/sg-attr-set-map-valuesGodfrey Chan2014-06-292-7/+4
|\ \ \ \ \
| * | | | | Use `Hash#transform_values` to clean up `AttributeSet`Sean Griffin2014-06-292-7/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #15979 from sgrif/sg-json-quotingGodfrey Chan2014-06-294-23/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use the type object for sending JSON to the databaseSean Griffin2014-06-294-23/+11
| |/ / /
* | | | Merge pull request #15819 from sgrif/sg-hash-map-valuesGuillermo Iguaran2014-06-294-0/+76
|\ \ \ \ | |/ / / |/| | |
| * | | Add `Hash#map_values` to ActiveSupportSean Griffin2014-06-294-0/+76
|/ / /
* | | Tiny documentation fixes [ci skip]Robin Dupret2014-06-293-5/+5
* | | Quick pass through Active Support and guides CHANGELOGRobin Dupret2014-06-292-3/+5
* | | Merge pull request #15961 from mckramer/patch-1Rafael Mendonça França2014-06-291-2/+2
|\ \ \
| * | | Rename options param of #time_ago_in_words to match API changeMax Kramer2014-06-281-2/+2
* | | | Merge pull request #15962 from sgrif/sg-types-for-defaultsRafael Mendonça França2014-06-298-28/+25
|\ \ \ \ | |_|_|/ |/| | |
| * | | Always pass a column with a type object to quoteSean Griffin2014-06-288-28/+25
| |/ /
* | | Merge pull request #15963 from roryokane/getting-started-guide-fix-grammarSean Griffin2014-06-281-3/+3
|\ \ \
| * | | Add punctuation and fix capitalization in Getting Started guideRory O’Kane2014-06-281-3/+3
| |/ /
* | | Merge pull request #15964 from JuanitoFatas/doc/patch-01Sean Griffin2014-06-281-1/+1
|\ \ \ | |/ / |/| |