aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add include_hidden option to collection_check_boxes helperVasiliy Ermolovich2013-10-273-4/+19
|
* Merge pull request #12656 from dougcole/fix_strong_parameters_fetchGuillermo Iguaran2013-10-262-1/+14
|\ | | | | don't let StrongParameters mutate the hash with fetch
| * don't mutate hash with fetchDoug Cole2013-10-262-1/+14
|/
* Merge pull request #12655 from ↵Santiago Pastorino2013-10-261-2/+5
|\ | | | | | | | | rails/ps-remove-surprise-if-in-show-exception-middleware Remove surprise if from show_exception middleware
| * Remove surprise if from show_exception middlewarePrem Sichanugrist2013-10-271-2/+5
|/ | | This increase the readability within the rescue block.
* Merge pull request #12648 from chrisledet/patch-1Rafael Mendonça França2013-10-251-2/+2
|\ | | | | Fixed typo with after_commit docs
| * Fixed typo with after_commit docsChris Ledet2013-10-251-2/+2
|/ | | Fixed syntax error on `after_commit` docs
* Merge pull request #12643 from severin/pg_cast_json_on_writeYves Senn2013-10-253-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 Schoepke2013-10-253-0/+26
| | | | | | | | See also commit 5ac2341fab689344991b2a4817bd2bc8b3edac9d
* | prevent `time_zone_aware_attributes` test leak. follow-up to #12633.Yves Senn2013-10-251-21/+21
| |
* | only warn on leaked time zone state instead of rasing an error.Yves Senn2013-10-251-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_leaksYves Senn2013-10-2512-214/+223
|\ \ | |/ |/| prevent global timezone state from leaking out of test cases.
| * prevent global timezone state from leaking out of test cases.Yves Senn2013-10-2512-214/+223
| |
* | Merge pull request #12642 from ka8725/fix_usage_for_model_generatorsRafael Mendonça França2013-10-251-1/+1
|\ \ | | | | | | Improve usage example for model generator decimal field
| * | Improve usage example for model generatorAndrey Koleshko2013-10-251-1/+1
| | |
* | | Merge pull request #12641 from ↵Rafael Mendonça França2013-10-251-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 semanticsPaul Nikitochkin2013-10-251-2/+2
| | | | | | | | | | | | Fixes: #12640
* | | Merge pull request #12490 from senny/store_accessor_hstore_bugYves Senn2013-10-248-14/+127
|\ \ \ | | | | | | | | ActiveRecord Store works with PG `hstore` columns
| * | | `ActiveRecord::Store` works together with PG `hstore` columns.Yves Senn2013-10-256-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 Senn2013-10-253-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 typeYves Senn2013-10-251-0/+18
|/ / /
* | | Merge pull request #12621 from ↵Rafael Mendonça França2013-10-243-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 setlaurocaetano2013-10-243-1/+24
| | | |
* | | | Merge pull request #12636 from kongregate/dont_rescue_ExceptionsRafael Mendonça França2013-10-241-2/+2
|\ \ \ \ | | | | | | | | | | Avoid unnecessary catching of Exception instead of StandardError (conver...
| * | | | Avoid unnecessary catching of Exception instead of StandardError (converting ↵stopdropandrew2013-10-241-2/+2
| | |_|/ | |/| | | | | | | | | | Exceptions into StandardErrors)
* | | | Improve the test code for #8422Rafael Mendonça França2013-10-241-4/+4
| | | | | | | | | | | | | | | | | | | | * Remove unneeded comments. * Use key? instead of keys.include?.
* | | | Merge pull request #8491 from igagnidz/masterRafael Mendonça França2013-10-241-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | Issue #8442
| * | | | Added test to ensure that DescendantsTracker does not leak memory on ↵Iuri Gagnidze2012-12-091-0/+10
| | | | | | | | | | | | | | | | | | | | singleton classes
* | | | | Merge pull request #12632 from al2o3cr/fix_race_for_attribute_methodsAaron Patterson2013-10-241-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_methodsMatt Jones2013-10-241-6/+3
| | |/ / / | |/| | |
* | | | | Add CHANGELOG entry for #12635 [ci skip]Rafael Mendonça França2013-10-241-0/+4
| | | | |
* | | | | Merge pull request #12635 from mperham/4-0-stableGuillermo Iguaran2013-10-241-1/+0
| | | | | | | | | | | | | | | | | | | | Allow any version of BCrypt
* | | | | Merge pull request #10471 from andyw8/button_to_paramsRafael Mendonça França2013-10-243-0/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add params option for button_to Conflicts: actionpack/CHANGELOG.md
| * | | | | Add params option for button_toAndy Waite2013-09-183-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_procRafael Mendonça França2013-10-243-0/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make slice! honor default hash value/proc
| * | | | | | slice! should not remove default hash value/procAntonio Santos2013-10-243-0/+24
| | |_|_|_|/ | |/| | | |
* | | | | | Improve the CHANGELOG entry [ci skip]Rafael Mendonça França2013-10-241-10/+9
| | | | | |
* | | | | | Merge pull request #12624 from timsly/masterRafael Mendonça França2013-10-241-0/+16
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | update CHANGELOG
| * | | | | update CHANGELOGTima Maslyuchenko2013-10-241-0/+16
| |/ / / /
* | | | | Merge pull request #12629 from Peeja/has_many-pets-typoGuillermo Iguaran2013-10-241-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix typo: `has_many :pets`, not `pets :has_many`.
| * | | | Fix typo: `has_many :pets`, not `pets :has_many`.Peter Jaros2013-10-241-1/+1
|/ / / /
* | | | Merge pull request #12622 from timsly/helpers-from-outsideGuillermo Iguaran2013-10-232-1/+11
|\ \ \ \ | | | | | | | | | | pass app config to controller helper proxy
| * | | | pass app config to controller helper proxyTima Maslyuchenko2013-10-242-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_pathRafael Mendonça França2013-10-232-1/+9
|\ \ \ \ | | | | | | | | | | Correct error in Utils.normalize_path that changed paths improperly
| * | | | Correct error in Utils.normalize_path that changed paths improperlyJosh Symonds2013-10-232-1/+9
| | | | |
* | | | | Fix the install taskRafael Mendonça França2013-10-231-9/+1
|/ / / /
* | | | Merge pull request #12617 from skv-headless/masterRafael Mendonça França2013-10-231-4/+3
|\ \ \ \ | | | | | | | | | | [ci skip] second parameter of asset-url is deprecated
| * | | | [ci skip] second parameter of asset-url is depricatedEvgeniy2013-10-231-4/+3
| | | | |
* | | | | Merge pull request #12612 from ↵Rafael Mendonça França2013-10-233-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 rangesAkira Matsuda2013-10-233-6/+34
|/ / / / | | | | | | | | | | | | fixes 4.0.0 regression introduced in 0317b93c17a46d7663a8c36edc26ad0ba3d75f85
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 15:36:05 +0000