Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16044 from jjb/patch-1 | Zachary Scott | 2014-07-05 | 1 | -1/+1 |
|\ | |||||
| * | link directory to ActionMailer Previews documentation | John Bachir | 2014-07-03 | 1 | -1/+1 |
* | | Merge pull request #16068 from JuanitoFatas/4-2-changelogs | Zachary Scott | 2014-07-05 | 1 | -18/+14 |
|\ \ | |||||
| * | | [ci skip] Concludes changelog links in the bottom. | Juanito Fatas | 2014-07-06 | 1 | -18/+14 |
|/ / | |||||
* | | Revert "Merge pull request #16059 from jenncoop/json-serialized-attr" | Godfrey Chan | 2014-07-05 | 5 | -76/+2 |
* | | Merge pull request #16059 from jenncoop/json-serialized-attr | Godfrey Chan | 2014-07-05 | 5 | -2/+76 |
* | | Merge pull request #16065 from matthewd/mysql-explicit-non-strict | Matthew Draper | 2014-07-06 | 1 | -2/+2 |
|\ \ | |||||
| * | | If our connection is explicitly non-strict, tell MySQL | Matthew Draper | 2014-07-06 | 1 | -2/+2 |
* | | | Fix mysql/mysql2 failing with FK constraint errors | Godfrey Chan | 2014-07-05 | 1 | -1/+1 |
* | | | Re-enable foriegn key tests on MySQL | Godfrey Chan | 2014-07-05 | 2 | -5/+1 |
* | | | Merge pull request #16035 from sgrif/sg-range-types | Rafael Mendonça França | 2014-07-05 | 6 | -54/+40 |
|\ \ \ | |||||
| * | | | Use the type object for quoting PG Ranges | Sean Griffin | 2014-07-05 | 6 | -54/+40 |
* | | | | Only reference time specific methods in the time section [ci skip] | Sean Griffin | 2014-07-05 | 1 | -2/+2 |
* | | | | Remove *all* references to `Time.yesterday` [ci skip] | Sean Griffin | 2014-07-05 | 1 | -1/+1 |
* | | | | `Time.today` -> `Date.today` in guides. [ci skip] | Sean Griffin | 2014-07-05 | 1 | -1/+1 |
|/ / / | |||||
* | | | Add release notes entry for #15819 [ci skip] | Sean Griffin | 2014-07-04 | 1 | -0/+5 |
* | | | CHANGELOG and release notes entry for #16056 | Sean Griffin | 2014-07-04 | 2 | -0/+9 |
* | | | Merge pull request #16056 from sgrif/sg-required-associations | David Heinemeier Hansson | 2014-07-04 | 4 | -1/+105 |
|\ \ \ | |||||
| * | | | Add a `required` option to singular associations | Sean Griffin | 2014-07-04 | 4 | -1/+105 |
|/ / / | |||||
* | | | Merge pull request #16054 from rails/revert-16003-sg-refactor-sqlite3-strings | Matthew Draper | 2014-07-05 | 1 | -37/+13 |
|\ \ \ | |/ / |/| | | |||||
| * | | Revert "Use a type object for type casting behavior on SQLite3" | Matthew Draper | 2014-07-05 | 1 | -37/+13 |
|/ / | |||||
* | | Don't fail if unicode.org isn't talking to us | Matthew Draper | 2014-07-05 | 1 | -1/+3 |
* | | Fix typo | Rafael Mendonça França | 2014-07-04 | 1 | -1/+1 |
* | | Merge pull request #16013 from tgxworld/remove_symbolized_path_parameters | Rafael Mendonça França | 2014-07-04 | 5 | -10/+10 |
|\ \ | |||||
| * | | Remove symbolized_path_parameters. | Guo Xiang Tan | 2014-07-02 | 5 | -10/+10 |
* | | | Merge pull request #16003 from sgrif/sg-refactor-sqlite3-strings | Matthew Draper | 2014-07-05 | 1 | -13/+37 |
|\ \ \ | |||||
| * | | | Use a type object for type casting behavior on SQLite3 | Sean Griffin | 2014-07-01 | 1 | -13/+37 |
* | | | | Merge pull request #16028 from cade/fix_counter_cache_count_with_association_... | Rafael Mendonça França | 2014-07-04 | 3 | -1/+16 |
|\ \ \ \ | |||||
| * | | | | Add `:all` argument to `count` in `reset_counters` | Cade Truitt | 2014-07-02 | 3 | -1/+16 |
* | | | | | Merge pull request #16011 from xjlu/token_and_options | Rafael Mendonça França | 2014-07-04 | 2 | -3/+23 |
|\ \ \ \ \ | |||||
| * | | | | | Improve token_and_options regex and test | Xinjiang Lu | 2014-07-01 | 2 | -3/+23 |
* | | | | | | Merge pull request #16040 from seuros/patch-1 | Matthew Draper | 2014-07-05 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add arel to the controller template | Abdelkader Boudih | 2014-07-03 | 1 | -0/+1 |
* | | | | | | | Merge pull request #14005 from dmitry/test_coverage_for_actionmailer | Rafael Mendonça França | 2014-07-04 | 6 | -38/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add test coverage for the action mailer | Dmitry Polushkin | 2014-07-04 | 6 | -38/+16 |
* | | | | | | | | Merge pull request #16042 from akshay-vishnoi/doc_change | Matthew Draper | 2014-07-05 | 3 | -5/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | [ci skip] /javascript/ -> JavaScript - cover whole app | Akshay Vishnoi | 2014-07-04 | 3 | -5/+5 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #16049 from matthewd/find-via-reload | Matthew Draper | 2014-07-05 | 3 | -0/+19 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | After find-via-reload, the record is not new | Matthew Draper | 2014-07-05 | 3 | -0/+19 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #16046 from grosser/grosser/cleangen | Rafael Mendonça França | 2014-07-04 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | remove bundler magic | grosser | 2014-07-03 | 1 | -2/+1 |
* | | | | | | | | | Merge pull request #16037 from sgrif/sg-money-quoting | Rafael Mendonça França | 2014-07-04 | 3 | -11/+28 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Remove unneccessary special case for money in quoting | Sean Griffin | 2014-07-03 | 3 | -11/+28 |
* | | | | | | | | | Merge pull request #16048 from arunagw/aa-added-notice-index-page | Rafael Mendonça França | 2014-07-04 | 3 | -1/+11 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Display notice in index.html pages in scaffolded generated views | Arun Agrawal | 2014-07-04 | 3 | -1/+11 |
|/ / / / / / / / | |||||
* | | / / / / / | :fire: these are lambdas now [ci skip] | Godfrey Chan | 2014-07-03 | 1 | -9/+2 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #16038 from tbpgr/fix_guide_active_record_validations | Rafael Mendonça França | 2014-07-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix guide. sample code syntax error.[ci skip] | tbpgr | 2014-07-04 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #16036 from sgrif/sg-datetime-infinity | Rafael Mendonça França | 2014-07-03 | 3 | -3/+46 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Do not rely on the column type when quoting infinity | Sean Griffin | 2014-07-03 | 3 | -3/+46 |
| |/ / / / / / |