Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge pull request #20993 from budnik/patch-1 | Robin Dupret | 2015-07-23 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fixes documentation typo. | Дмитро Будник | 2015-07-23 | 1 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #20989 from matthewd/no-lock-basic-require | Matthew Draper | 2015-07-23 | 1 | -6/+4 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Don't apply locking around basic #load / #require | Matthew Draper | 2015-07-23 | 1 | -6/+4 | |
| |/ / / / / | ||||||
* | | | | | | rm `deep_munge`. You will live on in our hearts (and git history) | Aaron Patterson | 2015-07-21 | 3 | -26/+15 | |
* | | | | | | push param encoding in to the utils module | Aaron Patterson | 2015-07-21 | 2 | -14/+30 | |
* | | | | | | stop keeping track of keys when "deep munging" | Aaron Patterson | 2015-07-21 | 1 | -5/+3 | |
* | | | | | | recurse for arrays in `normalize_encode_params` | Aaron Patterson | 2015-07-21 | 1 | -5/+3 | |
* | | | | | | drop conditionals in conversion logic | Aaron Patterson | 2015-07-21 | 1 | -7/+5 | |
* | | | | | | rearrange logic to use positive branches | Aaron Patterson | 2015-07-21 | 1 | -4/+6 | |
* | | | | | | Merge pull request #20973 from vngrs/fix_rails_tests | Rafael Mendonça França | 2015-07-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | fix rails tests | Mehmet Emin İNAÇ | 2015-07-21 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #20967 from lxsameer/record_not_found | Rafael Mendonça França | 2015-07-21 | 5 | -5/+35 | |
|\ \ \ \ \ | ||||||
| * | | | | | Extra caller details added to ActiveRecord::RecordNotFound | Sameer Rahmani | 2015-07-21 | 5 | -5/+35 | |
* | | | | | | Merge pull request #20926 from rsanheim/fail-fast-bin-setup | Rafael Mendonça França | 2015-07-21 | 1 | -5/+9 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | add system! to fail fast in bin/setup | Rob Sanheim | 2015-07-18 | 1 | -5/+9 | |
* | | | | | | | Merge pull request #20819 from y-yagi/rails_api_gemfile | Rafael Mendonça França | 2015-07-21 | 2 | -1/+4 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | remove `web-console` from API app generated Gemfile | yuuji.yaginuma | 2015-07-09 | 2 | -1/+4 | |
* | | | | | | | Merge pull request #20668 from repinel/rename-restrict-dependent-destroy-i18n... | Rafael Mendonça França | 2015-07-21 | 6 | -4/+73 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Deprecate and rename the keys for association restrict_dependent_destroy | Roque Pinel | 2015-07-20 | 6 | -4/+73 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #20732 from jorihardman/timestamp_precison2 | Sean Griffin | 2015-07-20 | 6 | -18/+62 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Ensure that microsecond precision is only used for version of mysql that supp... | Jori Hardman | 2015-07-20 | 6 | -18/+62 | |
* | | | | | | | | Merge pull request #20751 from repinel/remove-unnecessary-dup | Rafael Mendonça França | 2015-07-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove unnecessary `dup` from Mapper `add_route` | Roque Pinel | 2015-07-01 | 1 | -1/+1 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #17109 from thejamespinto/patch-1 | Rafael Mendonça França | 2015-07-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | titleizing the New Link | Thiago Pinto | 2015-07-20 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #20956 from djpowers/patch-1 | Sean Griffin | 2015-07-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix minor typo in testing guide | Dave Powers | 2015-07-20 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Fix minor typo in test name | Sean Griffin | 2015-07-20 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #20947 | Sean Griffin | 2015-07-20 | 4 | -1/+26 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix state being carried over from previous transaction | Roque Pinel | 2015-07-20 | 4 | -1/+26 | |
|/ / / / / / / | ||||||
* | | | | | | | Correctly ignore `mark_for_destruction` without `autosave` | Sean Griffin | 2015-07-20 | 4 | -1/+16 | |
* | | | | | | | Merge pull request #20949 from vngrs/missing_method_in_exception | Sean Griffin | 2015-07-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add missing method name to exception description | Mehmet Emin İNAÇ | 2015-07-20 | 1 | -1/+1 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #20950 from vngrs/fix_wrong_doc_about_transaction | Sean Griffin | 2015-07-20 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix doc about ActiveRecord::Transactions::ClassMethods#transaction [ci skip] | Mehmet Emin İNAÇ | 2015-07-20 | 1 | -2/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #20895 from brian-davis/brian-davis | Sean Griffin | 2015-07-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | grammar fix to content_for method documentation in capture_helper.rb | Brian Davis | 2015-07-15 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #20384 from kaspth/per-request-cache | David Heinemeier Hansson | 2015-07-20 | 4 | -17/+82 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Remove unused persistent option. | Kasper Timm Hansen | 2015-07-18 | 1 | -3/+3 | |
| * | | | | | | | Make digest cache work in development. | Kasper Timm Hansen | 2015-07-18 | 4 | -14/+79 | |
* | | | | | | | | Fix tests broken by previous commit | Sean Griffin | 2015-07-19 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #20946 from schneems/schneems/let-it-go | Sean Griffin | 2015-07-19 | 32 | -60/+60 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Freeze string literals when not mutated. | schneems | 2015-07-19 | 32 | -60/+60 | |
* | | | | | | | | | Merge pull request #20936 from repinel/fix-params-fetch-exception-overwritten | Sean Griffin | 2015-07-19 | 3 | -3/+25 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix exception overwritten for parameters fetch method | Roque Pinel | 2015-07-18 | 3 | -3/+25 | |
* | | | | | | | | | | Merge Pull Request #16445 | Sean Griffin | 2015-07-19 | 6 | -5/+35 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix the test that was broken by #16445 rather than deleting it | Sean Griffin | 2015-07-19 | 1 | -0/+12 | |
| * | | | | | | | | | | Fix counter_cache for polymorphic associations | Stefan Kanev | 2015-07-19 | 6 | -16/+34 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #20944 from repinel/fix-time-with-zone-eql | Kasper Timm Hansen | 2015-07-19 | 3 | -1/+13 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | |