aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix indentation [ci skip]Carlos Antonio da Silva2013-10-271-2/+2
|
* Merge pull request #12578 from ↵Rafael Mendonça França2013-10-275-3/+24
|\ | | | | | | | | | | | | | | | | jeradphelps/configurable_schema_migrations_table_name Configurable name for schema_migrations table Conflicts: activerecord/CHANGELOG.md
| * added schema_migrations_table_name to ActiveRecord::Base in order that the ↵Jerad Phelps2013-10-275-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | name of the schema migrations table can be configured. consolidated test_schema_migrations_table_name tests Added changelog entry edited changelog removed commented lines removed reader ensure the schema migrations table is reset at end of test added entry to configuration guide guides typo and changelog order
* | Merge pull request #12668 from arunagw/aa-improvmentsRafael Mendonça França2013-10-272-7/+18
|\ \ | | | | | | Test fixed for app_generator
| * | Fixed tests for app_generatorArun Agrawal2013-10-272-7/+18
|/ / | | | | | | | | | | Added test for jbuilder and web-console inclusion. Added README.rdoc for test default files
* | Remove warning of shadowing outer local variableRafael Mendonça França2013-10-271-2/+2
| |
* | Assert the return value in the testRafael Mendonça França2013-10-271-1/+1
| |
* | Merge pull request #12664 from jetthoughts/12242_includes_in_through_associationRafael Mendonça França2013-10-274-2/+37
|\ \ | | | | | | Skip `include_values` from through associations chains for building association scope
| * | Skip `include_values` from through associations chains for building target scopePaul Nikitochkin2013-10-274-2/+37
| | | | | | | | | | | | Fixes: #12242, #9517, #10240
* | | Remove dead code after the skip_jbuilder option removalRafael Mendonça França2013-10-271-1/+0
| | |
* | | remove the skip_jbuilder option, just rm it from the GemfileAaron Patterson2013-10-271-3/+0
| | |
* | | add comments and fix variable name. oops, forgot to add this. orz!Aaron Patterson2013-10-271-2/+2
| | |
* | | remove unused methodsAaron Patterson2013-10-271-4/+0
| | |
* | | Merge remote-tracking branch 'origin/master'Aaron Patterson2013-10-275-12/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: Removal of javascript related gems when creating an app Conflicts: railties/lib/rails/generators/app_base.rb
| * \ \ Merge pull request #12657 from robin850/skip-javascriptGuillermo Iguaran2013-10-275-14/+21
| |\ \ \ | | | | | | | | | | Removal of javascript related files when creating an app
| | * | | Removal of javascript related gems when creating an appRobin Dupret2013-10-275-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 0417bc8 add the coffee-rails and javascript runtime gems even when passing the --skip-javascript option but this is not the desired behavior. Also remove all javascript related stuff in the generated application such as the vendor/assets/javascripts folder.
* | | | | add an option to skip jbuilderAaron Patterson2013-10-271-0/+4
| | | | |
* | | | | fix variable nameAaron Patterson2013-10-272-3/+3
| | | | |
* | | | | add jbuilder web-console and sdoc to the GemEntry listAaron Patterson2013-10-273-29/+33
| | | | |
* | | | | fix the class nameAaron Patterson2013-10-271-17/+17
| | | | |
* | | | | refactor Gemfile templateAaron Patterson2013-10-271-8/+6
| | | | |
* | | | | use the GemfileGem object for more entriesAaron Patterson2013-10-273-56/+53
| | | | |
* | | | | add the database gemAaron Patterson2013-10-273-9/+8
| | | | |
* | | | | get a list of gems when filling out the gemfileAaron Patterson2013-10-273-13/+42
|/ / / /
* | | | set accessors in the set_accessors! methodAaron Patterson2013-10-272-2/+2
| | | |
* | | | Merge pull request #12661 from robin850/patch-10Rafael Mendonça França2013-10-271-0/+8
|\ \ \ \ | | | | | | | | | | Add a changelog entry for #12656 [ci skip]
| * | | | Add a changelog entry for #12656 [ci skip]Robin Dupret2013-10-271-0/+8
| | | | |
* | | | | Add a note about ensuring the version is right for the adapter (since you ↵David Heinemeier Hansson2013-10-271-1/+1
|/ / / / | | | | | | | | | | | | might well have specified the right gem, but locked it to too low of a version)
* | | | 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
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 14:34:00 +0000