aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove the `text?` predicate from the type objectsSean Griffin2014-07-0618-32/+4
* Change back occurrences of SQLite(3) to sqlite3 when referring to theZachary Scott2014-07-065-12/+13
* Merge pull request #16057 from akshay-vishnoi/doc_changeZachary Scott2014-07-066-9/+9
|\
| * [ci skip] /sqlite/i --> SQLiteAkshay Vishnoi2014-07-066-9/+9
* | Merge pull request #15958 from aditya-kapoor/active-model-naming-guideRobin Dupret2014-07-061-0/+23
|\ \
| * | [ci skip] add guide for ActiveModel::NamingAditya Kapoor2014-07-051-0/+23
* | | Generate shallow paths for all children of shallow resources.Seb Jacobs2014-07-063-2/+29
* | | Merge pull request #16069 from dylanahsmith/mysql-quote-boolMatthew Draper2014-07-065-5/+49
|\ \ \
| * | | active_record: Type cast booleans and durations for string columns.Dylan Thacker-Smith2014-07-065-5/+49
|/ / /
* | | Merge pull request #16044 from jjb/patch-1Zachary Scott2014-07-051-1/+1
|\ \ \
| * | | link directory to ActionMailer Previews documentationJohn Bachir2014-07-031-1/+1
* | | | Merge pull request #16068 from JuanitoFatas/4-2-changelogsZachary Scott2014-07-051-18/+14
|\ \ \ \
| * | | | [ci skip] Concludes changelog links in the bottom.Juanito Fatas2014-07-061-18/+14
|/ / / /
* | | | Revert "Merge pull request #16059 from jenncoop/json-serialized-attr"Godfrey Chan2014-07-055-76/+2
* | | | Merge pull request #16059 from jenncoop/json-serialized-attrGodfrey Chan2014-07-055-2/+76
* | | | Merge pull request #16065 from matthewd/mysql-explicit-non-strictMatthew Draper2014-07-061-2/+2
|\ \ \ \
| * | | | If our connection is explicitly non-strict, tell MySQLMatthew Draper2014-07-061-2/+2
* | | | | Fix mysql/mysql2 failing with FK constraint errorsGodfrey Chan2014-07-051-1/+1
* | | | | Re-enable foriegn key tests on MySQLGodfrey Chan2014-07-052-5/+1
* | | | | Merge pull request #16035 from sgrif/sg-range-typesRafael Mendonça França2014-07-056-54/+40
|\ \ \ \ \
| * | | | | Use the type object for quoting PG RangesSean Griffin2014-07-056-54/+40
* | | | | | Only reference time specific methods in the time section [ci skip]Sean Griffin2014-07-051-2/+2
* | | | | | Remove *all* references to `Time.yesterday` [ci skip]Sean Griffin2014-07-051-1/+1
* | | | | | `Time.today` -> `Date.today` in guides. [ci skip]Sean Griffin2014-07-051-1/+1
|/ / / / /
* | | | | Add release notes entry for #15819 [ci skip]Sean Griffin2014-07-041-0/+5
* | | | | CHANGELOG and release notes entry for #16056Sean Griffin2014-07-042-0/+9
* | | | | Merge pull request #16056 from sgrif/sg-required-associationsDavid Heinemeier Hansson2014-07-044-1/+105
|\ \ \ \ \
| * | | | | Add a `required` option to singular associationsSean Griffin2014-07-044-1/+105
|/ / / / /
* | | | | Merge pull request #16054 from rails/revert-16003-sg-refactor-sqlite3-stringsMatthew Draper2014-07-051-37/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Revert "Use a type object for type casting behavior on SQLite3"Matthew Draper2014-07-051-37/+13
|/ / / /
* | | | Don't fail if unicode.org isn't talking to usMatthew Draper2014-07-051-1/+3
* | | | Fix typoRafael Mendonça França2014-07-041-1/+1
* | | | Merge pull request #16013 from tgxworld/remove_symbolized_path_parametersRafael Mendonça França2014-07-045-10/+10
|\ \ \ \
| * | | | Remove symbolized_path_parameters.Guo Xiang Tan2014-07-025-10/+10
* | | | | Merge pull request #16003 from sgrif/sg-refactor-sqlite3-stringsMatthew Draper2014-07-051-13/+37
|\ \ \ \ \
| * | | | | Use a type object for type casting behavior on SQLite3Sean Griffin2014-07-011-13/+37
* | | | | | Merge pull request #16028 from cade/fix_counter_cache_count_with_association_...Rafael Mendonça França2014-07-043-1/+16
|\ \ \ \ \ \
| * | | | | | Add `:all` argument to `count` in `reset_counters`Cade Truitt2014-07-023-1/+16
* | | | | | | Merge pull request #16011 from xjlu/token_and_optionsRafael Mendonça França2014-07-042-3/+23
|\ \ \ \ \ \ \
| * | | | | | | Improve token_and_options regex and testXinjiang Lu2014-07-012-3/+23
* | | | | | | | Merge pull request #16040 from seuros/patch-1Matthew Draper2014-07-051-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add arel to the controller templateAbdelkader Boudih2014-07-031-0/+1
* | | | | | | | | Merge pull request #14005 from dmitry/test_coverage_for_actionmailerRafael Mendonça França2014-07-046-38/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add test coverage for the action mailerDmitry Polushkin2014-07-046-38/+16
* | | | | | | | | | Merge pull request #16042 from akshay-vishnoi/doc_changeMatthew Draper2014-07-053-5/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | [ci skip] /javascript/ -> JavaScript - cover whole appAkshay Vishnoi2014-07-043-5/+5
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #16049 from matthewd/find-via-reloadMatthew Draper2014-07-053-0/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | After find-via-reload, the record is not newMatthew Draper2014-07-053-0/+19
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #16046 from grosser/grosser/cleangenRafael Mendonça França2014-07-041-2/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove bundler magicgrosser2014-07-031-2/+1