Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12643 from severin/pg_cast_json_on_write | Yves Senn | 2013-10-25 | 3 | -0/+26 |
|\ | | | | | cast json values on write to be consistent with reading from the db. | ||||
| * | cast json values on write to be consistent with reading from the db. | Severin Schoepke | 2013-10-25 | 3 | -0/+26 |
| | | | | | | | | See also commit 5ac2341fab689344991b2a4817bd2bc8b3edac9d | ||||
* | | prevent `time_zone_aware_attributes` test leak. follow-up to #12633. | Yves Senn | 2013-10-25 | 1 | -21/+21 |
| | | |||||
* | | only warn on leaked time zone state instead of rasing an error. | Yves Senn | 2013-10-25 | 1 | -3/+6 |
| | | | | | | | | | | | | Raising `RuntimeErrors` skips important cleanup code and leads to a lot of subsequent errors. This clutters the test output with a lot of noise. | ||||
* | | Merge pull request #12633 from senny/no_more_time_zone_leaks | Yves Senn | 2013-10-25 | 12 | -214/+223 |
|\ \ | |/ |/| | prevent global timezone state from leaking out of test cases. | ||||
| * | prevent global timezone state from leaking out of test cases. | Yves Senn | 2013-10-25 | 12 | -214/+223 |
| | | |||||
* | | Merge pull request #12642 from ka8725/fix_usage_for_model_generators | Rafael Mendonça França | 2013-10-25 | 1 | -1/+1 |
|\ \ | | | | | | | Improve usage example for model generator decimal field | ||||
| * | | Improve usage example for model generator | Andrey Koleshko | 2013-10-25 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #12641 from ↵ | Rafael Mendonça França | 2013-10-25 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | | | | | | | jetthoughts/12640_updated_migrations_doc_to_use_remove_column Fix migration docs to use new remove_column semantics | ||||
| * | | Fix migration docs to use new remove_column semantics | Paul Nikitochkin | 2013-10-25 | 1 | -2/+2 |
| | | | | | | | | | | | | Fixes: #12640 | ||||
* | | | Merge pull request #12490 from senny/store_accessor_hstore_bug | Yves Senn | 2013-10-24 | 8 | -14/+127 |
|\ \ \ | | | | | | | | | ActiveRecord Store works with PG `hstore` columns | ||||
| * | | | `ActiveRecord::Store` works together with PG `hstore` columns. | Yves Senn | 2013-10-25 | 6 | -14/+88 |
| | | | | | | | | | | | | | | | | | | | | | | | | This is necessary because as of 5ac2341 `hstore` columns are always stored as `Hash` with `String` keys. `ActiveRecord::Store` expected the attribute to be an instance of `HashWithIndifferentAccess`, which led to the bug. | ||||
| * | | | `stored_attributes` need to be specific to a subclass. | Yves Senn | 2013-10-25 | 3 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently they are all stored globally in the same `Hash`. This commit forces the creation of a per-class variable if necessary. The behavior was exposed through the following test-case: ``` 1) Failure: StoreTest#test_all_stored_attributes_are_returned [/Users/senny/Projects/rails/activerecord/test/cases/store_test.rb:151]: --- expected +++ actual @@ -1 +1 @@ -[:color, :homepage, :favorite_food] +[:resolution, :color, :homepage, :favorite_food] ``` | ||||
| * | | | test to verify the `ActiveRecord::Store` behavior with PG's json type | Yves Senn | 2013-10-25 | 1 | -0/+18 |
|/ / / | |||||
* | | | Merge pull request #12621 from ↵ | Rafael Mendonça França | 2013-10-24 | 3 | -1/+24 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | laurocaetano/fix_has_one_association_with_primary_key_set Save association when primary key is manually set Conflicts: activerecord/CHANGELOG.md | ||||
| * | | | Save association when primary key is manually set | laurocaetano | 2013-10-24 | 3 | -1/+24 |
| | | | | |||||
* | | | | Merge pull request #12636 from kongregate/dont_rescue_Exceptions | Rafael Mendonça França | 2013-10-24 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Avoid unnecessary catching of Exception instead of StandardError (conver... | ||||
| * | | | | Avoid unnecessary catching of Exception instead of StandardError (converting ↵ | stopdropandrew | 2013-10-24 | 1 | -2/+2 |
| | |_|/ | |/| | | | | | | | | | | Exceptions into StandardErrors) | ||||
* | | | | Improve the test code for #8422 | Rafael Mendonça França | 2013-10-24 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | * Remove unneeded comments. * Use key? instead of keys.include?. | ||||
* | | | | Merge pull request #8491 from igagnidz/master | Rafael Mendonça França | 2013-10-24 | 1 | -0/+10 |
|\ \ \ \ | | | | | | | | | | | | | | | | Issue #8442 | ||||
| * | | | | Added test to ensure that DescendantsTracker does not leak memory on ↵ | Iuri Gagnidze | 2012-12-09 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | singleton classes | ||||
* | | | | | Merge pull request #12632 from al2o3cr/fix_race_for_attribute_methods | Aaron Patterson | 2013-10-24 | 1 | -6/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Always check to see if methods exist after calling define_attribute_methods | ||||
| * | | | | | always check to see if methods exist after calling define_attribute_methods | Matt Jones | 2013-10-24 | 1 | -6/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | Add CHANGELOG entry for #12635 [ci skip] | Rafael Mendonça França | 2013-10-24 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge pull request #12635 from mperham/4-0-stable | Guillermo Iguaran | 2013-10-24 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | Allow any version of BCrypt | ||||
* | | | | | Merge pull request #10471 from andyw8/button_to_params | Rafael Mendonça França | 2013-10-24 | 3 | -0/+19 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add params option for button_to Conflicts: actionpack/CHANGELOG.md | ||||
| * | | | | | Add params option for button_to | Andy Waite | 2013-09-18 | 3 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parameters are rendered as hidden form fields within the generated form. This is useful for when a record has multiple buttons associated with it, each of which target the same controller method, but which need to submit different attributes. | ||||
* | | | | | | Merge pull request #12611 from antonio/slice_bang_honor_default_proc | Rafael Mendonça França | 2013-10-24 | 3 | -0/+24 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Make slice! honor default hash value/proc | ||||
| * | | | | | | slice! should not remove default hash value/proc | Antonio Santos | 2013-10-24 | 3 | -0/+24 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Improve the CHANGELOG entry [ci skip] | Rafael Mendonça França | 2013-10-24 | 1 | -10/+9 |
| | | | | | | |||||
* | | | | | | Merge pull request #12624 from timsly/master | Rafael Mendonça França | 2013-10-24 | 1 | -0/+16 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | update CHANGELOG | ||||
| * | | | | | update CHANGELOG | Tima Maslyuchenko | 2013-10-24 | 1 | -0/+16 |
| |/ / / / | |||||
* | | | | | Merge pull request #12629 from Peeja/has_many-pets-typo | Guillermo Iguaran | 2013-10-24 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix typo: `has_many :pets`, not `pets :has_many`. | ||||
| * | | | | Fix typo: `has_many :pets`, not `pets :has_many`. | Peter Jaros | 2013-10-24 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #12622 from timsly/helpers-from-outside | Guillermo Iguaran | 2013-10-23 | 2 | -1/+11 |
|\ \ \ \ | | | | | | | | | | | pass app config to controller helper proxy | ||||
| * | | | | pass app config to controller helper proxy | Tima Maslyuchenko | 2013-10-24 | 2 | -1/+11 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After this fix application config become available when calling helper outisde of view config/application.rb #... config.asset_host = 'http://mycdn.com' #... Somewhere else ActionController::Base.helpers.asset_path('fallback.png') # => http://mycdn.com/assets/fallback.png | ||||
* | | | | Merge pull request #12619 from Veraticus/fix_utils_normalize_path | Rafael Mendonça França | 2013-10-23 | 2 | -1/+9 |
|\ \ \ \ | | | | | | | | | | | Correct error in Utils.normalize_path that changed paths improperly | ||||
| * | | | | Correct error in Utils.normalize_path that changed paths improperly | Josh Symonds | 2013-10-23 | 2 | -1/+9 |
| | | | | | |||||
* | | | | | Fix the install task | Rafael Mendonça França | 2013-10-23 | 1 | -9/+1 |
|/ / / / | |||||
* | | | | Merge pull request #12617 from skv-headless/master | Rafael Mendonça França | 2013-10-23 | 1 | -4/+3 |
|\ \ \ \ | | | | | | | | | | | [ci skip] second parameter of asset-url is deprecated | ||||
| * | | | | [ci skip] second parameter of asset-url is depricated | Evgeniy | 2013-10-23 | 1 | -4/+3 |
| | | | | | |||||
* | | | | | Merge pull request #12612 from ↵ | Rafael Mendonça França | 2013-10-23 | 3 | -6/+34 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | amatsuda/amo_validates_inclusion_of_time_range_error Let validates_inclusion_of accept Time and DateTime ranges | ||||
| * | | | | Let validates_inclusion_of accept Time and DateTime ranges | Akira Matsuda | 2013-10-23 | 3 | -6/+34 |
|/ / / / | | | | | | | | | | | | | fixes 4.0.0 regression introduced in 0317b93c17a46d7663a8c36edc26ad0ba3d75f85 | ||||
* | | | | Try arel master | Rafael Mendonça França | 2013-10-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile | ||||
* | | | | this should be private, no other instances of Root should call it | Aaron Patterson | 2013-10-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | do not search through the keys array twice | Aaron Patterson | 2013-10-22 | 1 | -2/+3 |
| | | | | |||||
* | | | | use the provided block to filter lists | Aaron Patterson | 2013-10-22 | 1 | -11/+5 |
| | | | | |||||
* | | | | stop using `send` so that method privacy is respected and we get a small | Aaron Patterson | 2013-10-22 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | perf increase | ||||
* | | | | Fix order dependent tests | Rafael Mendonça França | 2013-10-22 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge pull request #12606 from robin850/apps-with-spaces | Yves Senn | 2013-10-22 | 4 | -2/+20 |
|\ \ \ \ | | | | | | | | | | | Make the application name snake cased when it contains spaces |