aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Stop requiring mocha automaticallyRafael Mendonça França2014-07-1914-5/+19
* Stop using mocha on dbconsole_testRafael Mendonça França2014-07-151-44/+68
* Stop using mocha on console_testRafael Mendonça França2014-07-071-15/+40
* Set the application logger using configurationRafael Mendonça França2014-07-071-3/+5
* Stop using mocha on configuration_testRafael Mendonça França2014-07-071-7/+23
* Stop using mocha on app_rails_loader_testRafael Mendonça França2014-07-072-10/+27
* test i18n against a routed appAaron Patterson2014-07-071-1/+16
* remove the mounted_helpers respond_to checkAaron Patterson2014-07-071-1/+1
* always test against a routed rack app so there are always url_helpersAaron Patterson2014-07-075-36/+66
* Merge pull request #16078 from tgxworld/retreive_connection_onceRafael Mendonça França2014-07-071-2/+3
|\
| * Avoid retrieving connection in ActiveRecord::QueryCache multiple times.Guo Xiang Tan2014-07-071-2/+3
* | Merge pull request #16074 from sgrif/sg-remove-text-predicateRafael Mendonça França2014-07-0718-32/+4
|\ \
| * | Remove the `text?` predicate from the type objectsSean Griffin2014-07-0618-32/+4
| |/
* | Merge pull request #16086 from nickpellant/masterEileen M. Uchitelle2014-07-071-0/+14
|\ \
| * | [ci skip] Improve callback code example for 4.1 upgrade docs.Nick Pellant2014-07-071-4/+4
| * | Add callbacks documentation for upgrading to 4.1.Nick Pellant2014-07-071-0/+14
* | | Update Rails versions [ci skip]Robin Dupret2014-07-075-19/+19
|/ /
* | Merge pull request #16075 from nickpellant/masterSean Griffin2014-07-061-1/+1
|\ \ | |/ |/|
| * Fix ActiveSupport::Callbacks #set_callback docs.Nick Pellant2014-07-071-1/+1
|/
* 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