aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | drop conditionals in conversion logicAaron Patterson2015-07-211-7/+5
* | | | | | rearrange logic to use positive branchesAaron Patterson2015-07-211-4/+6
* | | | | | Merge pull request #20973 from vngrs/fix_rails_testsRafael Mendonça França2015-07-211-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | fix rails testsMehmet Emin İNAÇ2015-07-211-1/+1
|/ / / / /
* | | | | Merge pull request #20967 from lxsameer/record_not_foundRafael Mendonça França2015-07-215-5/+35
|\ \ \ \ \
| * | | | | Extra caller details added to ActiveRecord::RecordNotFoundSameer Rahmani2015-07-215-5/+35
* | | | | | Merge pull request #20926 from rsanheim/fail-fast-bin-setupRafael Mendonça França2015-07-211-5/+9
|\ \ \ \ \ \
| * | | | | | add system! to fail fast in bin/setupRob Sanheim2015-07-181-5/+9
* | | | | | | Merge pull request #20819 from y-yagi/rails_api_gemfileRafael Mendonça França2015-07-212-1/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | remove `web-console` from API app generated Gemfileyuuji.yaginuma2015-07-092-1/+4
* | | | | | | Merge pull request #20668 from repinel/rename-restrict-dependent-destroy-i18n...Rafael Mendonça França2015-07-216-4/+73
|\ \ \ \ \ \ \
| * | | | | | | Deprecate and rename the keys for association restrict_dependent_destroyRoque Pinel2015-07-206-4/+73
|/ / / / / / /
* | | | | | | Merge pull request #20732 from jorihardman/timestamp_precison2Sean Griffin2015-07-206-18/+62
|\ \ \ \ \ \ \
| * | | | | | | Ensure that microsecond precision is only used for version of mysql that supp...Jori Hardman2015-07-206-18/+62
* | | | | | | | Merge pull request #20751 from repinel/remove-unnecessary-dupRafael Mendonça França2015-07-201-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unnecessary `dup` from Mapper `add_route`Roque Pinel2015-07-011-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #17109 from thejamespinto/patch-1Rafael Mendonça França2015-07-201-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | titleizing the New LinkThiago Pinto2015-07-201-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #20956 from djpowers/patch-1Sean Griffin2015-07-201-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix minor typo in testing guideDave Powers2015-07-201-1/+1
|/ / / / / / /
* | | | | | | Fix minor typo in test nameSean Griffin2015-07-201-1/+1
* | | | | | | Merge pull request #20947Sean Griffin2015-07-204-1/+26
|\ \ \ \ \ \ \
| * | | | | | | Fix state being carried over from previous transactionRoque Pinel2015-07-204-1/+26
|/ / / / / / /
* | | | | | | Correctly ignore `mark_for_destruction` without `autosave`Sean Griffin2015-07-204-1/+16
* | | | | | | Merge pull request #20949 from vngrs/missing_method_in_exceptionSean Griffin2015-07-201-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Add missing method name to exception descriptionMehmet Emin İNAÇ2015-07-201-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #20950 from vngrs/fix_wrong_doc_about_transactionSean Griffin2015-07-201-2/+1
|\ \ \ \ \ \ \
| * | | | | | | fix doc about ActiveRecord::Transactions::ClassMethods#transaction [ci skip]Mehmet Emin İNAÇ2015-07-201-2/+1
| |/ / / / / /
* | | | | | | Merge pull request #20895 from brian-davis/brian-davisSean Griffin2015-07-201-1/+1
|\ \ \ \ \ \ \
| * | | | | | | grammar fix to content_for method documentation in capture_helper.rbBrian Davis2015-07-151-1/+1
* | | | | | | | Merge pull request #20384 from kaspth/per-request-cacheDavid Heinemeier Hansson2015-07-204-17/+82
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Remove unused persistent option.Kasper Timm Hansen2015-07-181-3/+3
| * | | | | | | Make digest cache work in development.Kasper Timm Hansen2015-07-184-14/+79
* | | | | | | | Fix tests broken by previous commitSean Griffin2015-07-191-1/+1
* | | | | | | | Merge pull request #20946 from schneems/schneems/let-it-goSean Griffin2015-07-1932-60/+60
|\ \ \ \ \ \ \ \
| * | | | | | | | Freeze string literals when not mutated.schneems2015-07-1932-60/+60
* | | | | | | | | Merge pull request #20936 from repinel/fix-params-fetch-exception-overwrittenSean Griffin2015-07-193-3/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix exception overwritten for parameters fetch methodRoque Pinel2015-07-183-3/+25
* | | | | | | | | | Merge Pull Request #16445Sean Griffin2015-07-196-5/+35
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix the test that was broken by #16445 rather than deleting itSean Griffin2015-07-191-0/+12
| * | | | | | | | | | Fix counter_cache for polymorphic associationsStefan Kanev2015-07-196-16/+34
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #20944 from repinel/fix-time-with-zone-eqlKasper Timm Hansen2015-07-193-1/+13
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix `TimeWithZone#eql?` to handle `TimeWithZone` created from `DateTime`Roque Pinel2015-07-193-1/+13
| |/ / / / / / / /
* | | | | | | | | Merge pull request #20931 from eliotsykes/force_ssl-docs-options-formattingKasper Timm Hansen2015-07-191-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix formatting of force_ssl options documentation [ci skip]Eliot Sykes2015-07-191-6/+6
|/ / / / / / / / /
* | | | | | | | | Merge pull request #20924 from andrii/masterAbdelkader Boudih2015-07-191-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] Fix typo in #any? RDocAndrii Ponomarov2015-07-171-1/+1
* | | | | | | | | | Merge pull request #20839 from TheBlasfem/added_examples_dateandtime_calculat...Sean Griffin2015-07-181-9/+34
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | added examples to DateAndTime::Calculations [ci skip]Julio Lopez2015-07-181-9/+34
* | | | | | | | | | Merge pull request #20932 from twalpole/collection_association_parametersSean Griffin2015-07-182-1/+19
|\ \ \ \ \ \ \ \ \ \