aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 target scopePaul Nikitochkin2013-10-274-2/+37
* | 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
|\ \
| * \ Merge pull request #12657 from robin850/skip-javascriptGuillermo Iguaran2013-10-275-14/+21
| |\ \
| | * | Removal of javascript related gems when creating an appRobin Dupret2013-10-275-14/+21
* | | | 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]Robin Dupret2013-10-271-0/+8
* | | | Add a note about ensuring the version is right for the adapter (since you mig...David Heinemeier Hansson2013-10-271-1/+1
|/ / /
* | | Merge pull request #12656 from dougcole/fix_strong_parameters_fetchGuillermo Iguaran2013-10-262-1/+14
|\ \ \ | |_|/ |/| |
| * | don't mutate hash with fetchDoug Cole2013-10-262-1/+14
|/ /
* | Merge pull request #12655 from rails/ps-remove-surprise-if-in-show-exception-...Santiago Pastorino2013-10-261-2/+5
|\ \
| * | Remove surprise if from show_exception middlewarePrem Sichanugrist2013-10-271-2/+5
|/ /
* | Merge pull request #12648 from chrisledet/patch-1Rafael Mendonça França2013-10-251-2/+2
|\ \
| * | Fixed typo with after_commit docsChris Ledet2013-10-251-2/+2
|/ /
* | 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.Severin Schoepke2013-10-253-0/+26
* | | 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
* | | 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.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 generatorAndrey Koleshko2013-10-251-1/+1
* | | | Merge pull request #12641 from jetthoughts/12640_updated_migrations_doc_to_us...Rafael Mendonça França2013-10-251-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix migration docs to use new remove_column semanticsPaul Nikitochkin2013-10-251-2/+2
* | | | Merge pull request #12490 from senny/store_accessor_hstore_bugYves Senn2013-10-248-14/+127
|\ \ \ \
| * | | | `ActiveRecord::Store` works together with PG `hstore` columns.Yves Senn2013-10-256-14/+88
| * | | | `stored_attributes` need to be specific to a subclass.Yves Senn2013-10-253-0/+21
| * | | | test to verify the `ActiveRecord::Store` behavior with PG's json typeYves Senn2013-10-251-0/+18
|/ / / /
* | | | Merge pull request #12621 from laurocaetano/fix_has_one_association_with_prim...Rafael Mendonça França2013-10-243-1/+24
|\ \ \ \
| * | | | 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 (converting ...stopdropandrew2013-10-241-2/+2
| | |_|/ / | |/| | |
* | | | | Improve the test code for #8422Rafael Mendonça França2013-10-241-4/+4
* | | | | Merge pull request #8491 from igagnidz/masterRafael Mendonça França2013-10-241-0/+10
|\ \ \ \ \
| * | | | | Added test to ensure that DescendantsTracker does not leak memory on singleto...Iuri Gagnidze2012-12-091-0/+10
* | | | | | 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_methodsMatt Jones2013-10-241-6/+3
| | |/ / / / | |/| | | |