| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | make variable name more clear | Aaron Patterson | 2014-05-21 | 1 | -2/+2 |
| | | |||||
| * | do not mutate parameters, let the caller do mutations | Aaron Patterson | 2014-05-21 | 2 | -4/+6 |
| | | |||||
| * | push the formatter up to the Route object | Aaron Patterson | 2014-05-21 | 2 | -4/+4 |
| | | |||||
| * | Merge pull request #15231 from ↵ | Guillermo Iguaran | 2014-05-21 | 1 | -1/+1 |
| |\ | | | | | | | | | khusnetdinov/fix_typo_guides_active_support_instrumentation Fix typo guides/source/active_support_instrumentation.md [ci-skip] | ||||
| | * | Fix typo guides/source/active_support_instrumentation.md | Marat Khusnetdinov | 2014-05-22 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #15229 from peeyushsingla/master | Rafael Mendonça França | 2014-05-21 | 1 | -2/+2 |
| |\ \ | | | | | | | fixes in active record query for reorder in rails guides | ||||
| | * | | fixes in active record query for reorder | peeyush | 2014-05-21 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #15227 from sgrif/sg-rename-oid-type | Rafael Mendonça França | 2014-05-21 | 2 | -15/+5 |
| |\ \ \ | |/ / |/| | | Rename `oid_type` to `cast_type` to make PG columns consistent with abstract columns | ||||
| | * | | Rename `oid_type` to `cast_type` to make PG columns consistent | Sean Griffin | 2014-05-21 | 2 | -15/+5 |
| |/ / | |||||
| * | | Merge pull request #15219 from sgrif/sg-missing-nodoc | Rafael Mendonça França | 2014-05-21 | 1 | -3/+3 |
| |\ \ | | | | | | | Add missing nodoc | ||||
| | * | | Add missing nodocs to MySQL adapter | Sean Griffin | 2014-05-21 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge pull request #14613 from Sirupsen/fix-serialize-update-column | Rafael Mendonça França | 2014-05-21 | 4 | -14/+51 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix serialized field returning serialized data after update_column Conflicts: activerecord/CHANGELOG.md | ||||
| | * | | | Fix serialized field returning serialized data after update_column | Simon Eskildsen | 2014-04-05 | 4 | -14/+51 |
| | | | | | |||||
| * | | | | Revert "Merge pull request #14544 from jefflai2/named_scope_sti" | Rafael Mendonça França | 2014-05-21 | 8 | -42/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9a1abedcdeecd9464668695d4f9c1d55a2fd9332, reversing changes made to c72d6c91a7c0c2dc81cc857a1d6db496e84e0065. Conflicts: activerecord/CHANGELOG.md activerecord/test/models/comment.rb This change break integration with activerecord-deprecated_finders so I'm reverting until we find a way to make it work with this gem. | ||||
| * | | | | Merge pull request #15221 from laurelfan/doc-fix-redirecting | Arthur Nogueira Neves | 2014-05-21 | 1 | -4/+8 |
| |\ \ \ \ | |_|/ / |/| | | | fix formatting and text for ActionController::Redirecting doc | ||||
| | * | | | fix formatting and text for ActionController::Redirecting doc | Laurel Fan | 2014-05-21 | 1 | -4/+8 |
| | | | | | |||||
| * | | | | build fix, use lambda syntax that ruby 1.9.3 understands. | Yves Senn | 2014-05-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | push `extract_scale` to the `Type`. | Yves Senn | 2014-05-21 | 4 | -7/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `extract_precision`, `extract_limit`, and `extract_default` probably need to follow. - would be good to remove the delegation `Column#extract_scale`. /cc @sgrif | ||||
| * | | | | pg, extract money tests into separate file. | Yves Senn | 2014-05-21 | 2 | -35/+55 |
| | | | | | | | | | | | | | | | | | | | | | - Added assertions about the column. Specifically scale. - Move record insertion from setup into test method. | ||||
| * | | | | Merge pull request #14855 from laurocaetano/fix_polymorphic_with_string_key | Yves Senn | 2014-05-21 | 5 | -4/+50 |
| |\ \ \ \ | | | | | | | | | | | | | | | | Fix polymorphic eager load with foreign_key as String. | ||||
| | * | | | | Fix polymorphic eager load with foreign_key as String. | Lauro Caetano | 2014-05-20 | 5 | -2/+42 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The foreign_key could be `String` and just doing `owners_map[owner_key]` could return `nil`. To prevent this bug, we should `to_s` both keys if their types are different. Fixes #14734. | ||||
| * | | | | Merge pull request #15213 from tgxworld/remove_redundant_code | Rafael Mendonça França | 2014-05-20 | 1 | -3/+2 |
| |\ \ \ \ | | | | | | | | | | | Remove redundant code. | ||||
| | * | | | | Remove redundant code. | Guo Xiang Tan | 2014-05-20 | 1 | -3/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #10887 from sakuro/deep_transform_keys_in_nested_arrays | Rafael Mendonça França | 2014-05-20 | 3 | -16/+67 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Hash#deep_*_keys(!) recurse into nested arrays. Conflicts: activesupport/CHANGELOG.md | ||||
| | * | | | | Hash#deep_*_keys(!) recurse into nested arrays. | OZAWA Sakuro | 2013-06-08 | 3 | -16/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following methods now recursively transform nested arrays, too. * Hash#deep_transform_keys * Hash#deep_transform_keys! * Hash#deep_stringify_keys * Hash#deep_stringify_keys! * Hash#deep_symbolize_keys * Hash#deep_symbolize_keys! | ||||
| * | | | | | Merge pull request #14544 from jefflai2/named_scope_sti | Rafael Mendonça França | 2014-05-20 | 8 | -5/+42 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Issue #13466. Conflicts: activerecord/CHANGELOG.md | ||||
| | * | | | | | Fixes Issue #13466. | Jefferson Lai | 2014-04-23 | 8 | -5/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the call to a scope block to be evaluated with instance_eval. The result is that ScopeRegistry can use the actual class instead of base_class when caching scopes so queries made by classes with a common ancestor won't leak scopes. | ||||
| * | | | | | | Merge pull request #15205 from sgrif/sg-delegate-klass | Rafael Mendonça França | 2014-05-20 | 9 | -14/+33 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Delegate `klass` to the injected type object | ||||
| | * | | | | | | Delegate `klass` to the injected type object | Sean Griffin | 2014-05-20 | 9 | -14/+33 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #14979 from brocktimus/master | Rafael Mendonça França | 2014-05-20 | 3 | -1/+16 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Making belongs_to: touch behaviour be consistent with save updating updated_at | ||||
| | * | | | | | | | Prevented belongs_to: touch propagating up if there are no changes being saved | Brock Trappitt | 2014-05-21 | 3 | -1/+16 |
| | | | | | | | | | |||||
| * | | | | | | | | Revert "Revert "Merge pull request #8313 from ↵ | Rafael Mendonça França | 2014-05-20 | 3 | -8/+22 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alan/only_save_changed_has_one_objects"" This reverts commit e94e6c27af495a2460c811bb506459f1428dec6b. Conflicts: activerecord/CHANGELOG.md The original commit was reverted only to be safe since #14407 were reported. We don't have any proof we added a regression with the original commit so reverting it now will give us more problem. Closes #14407 | ||||
| * | | | | | | | Merge pull request #15154 from msgehard/move_password_field | Rafael Mendonça França | 2014-05-20 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Put attr_reader in with all of the other instance methods | ||||
| | * | | | | | | | Put attr_reader in with all of the other instance methods | Mike Gehard | 2014-05-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the grouping make a little more sense | ||||
| * | | | | | | | | we don't use this parameter for anything, so rm | Aaron Patterson | 2014-05-20 | 3 | -22/+21 |
| | | | | | | | | | |||||
| * | | | | | | | | fewer string allocations per url_for | Aaron Patterson | 2014-05-20 | 1 | -7/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | mutate the path string to avoid object allocations | Aaron Patterson | 2014-05-20 | 1 | -4/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | push only_path conditional up | Aaron Patterson | 2014-05-20 | 1 | -18/+19 |
| | | | | | | | | | |||||
| * | | | | | | | | push arg checking up | Aaron Patterson | 2014-05-20 | 1 | -4/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | fewer method calls and string garbage when there is no user/password | Aaron Patterson | 2014-05-20 | 1 | -9/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | fewer hash allocations when calling url_for | Aaron Patterson | 2014-05-20 | 1 | -9/+12 |
| | | | | | | | | | |||||
| * | | | | | | | | fix variable names, only pass hashes to the positional args method | Aaron Patterson | 2014-05-20 | 1 | -8/+10 |
| | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | | Merge pull request #15208 from sgrif/sg-delegate-type-cast-for-write | Rafael Mendonça França | 2014-05-20 | 4 | -30/+14 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Delegate `type_cast_for_write` to injected type object | ||||
| | * | | | | | | | Delegate `type_cast_for_write` to injected type object | Sean Griffin | 2014-05-20 | 4 | -30/+14 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #11346 from tomykaira/fix_10257 | Rafael Mendonça França | 2014-05-20 | 2 | -2/+21 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Check authentication scheme in Basic auth | ||||
| | * | | | | | | | Run login_procedure only when the auth_scheme is valid | tomykaira | 2013-07-08 | 1 | -7/+14 |
| | | | | | | | | | |||||
| | * | | | | | | | Check authentication scheme in Basic auth | tomykaira | 2013-07-07 | 2 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `authenticate_with_http_basic` and its families should check the authentication schema is "Basic". Different schema, such as OAuth2 Bearer should be rejected by basic auth, but it was passing as the test shows. This fixes #10257. | ||||
| * | | | | | | | | Merge pull request #15207 from sgrif/sg-inline-column-helpers | Rafael Mendonça França | 2014-05-20 | 10 | -120/+77 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Inline typecasting helpers from Column to the appropriate types | ||||
| | * | | | | | | | | Inline typecasting helpers from Column to the appropriate types | Sean Griffin | 2014-05-20 | 10 | -120/+77 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #15206 from sgrif/sg-type-map-postgresql | Rafael Mendonça França | 2014-05-20 | 3 | -45/+31 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use the generic type map for PostgreSQL OID registrations | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |