aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix template GemfilesAaron Patterson2013-10-283-12/+25
* always call set_default_accessors from create_rootAaron Patterson2013-10-281-0/+1
* Merge pull request #11785 from grosser/grosser/file-unless-existRafael Mendonça França2013-10-283-0/+12
|\
| * support :unless_exist for FileCachegrosser2013-08-303-0/+12
* | use a queue rather than a list. fixes #12069Aaron Patterson2013-10-281-1/+1
* | Merge pull request #11564 from zzak/active_model_guideYves Senn2013-10-281-0/+6
|\ \
| * | add active model basics wip to guides/documents.yamlZachary Scott2013-07-221-0/+6
* | | fix typo in comment [ci skip].Yves Senn2013-10-281-1/+1
* | | Fix typoDavid Heinemeier Hansson2013-10-271-1/+1
* | | Fix indentation [ci skip]Carlos Antonio da Silva2013-10-271-2/+2
* | | Merge pull request #12578 from jeradphelps/configurable_schema_migrations_tab...Rafael Mendonça França2013-10-275-3/+24
|\ \ \
| * | | added schema_migrations_table_name to ActiveRecord::Base in order that the na...Jerad Phelps2013-10-275-3/+24
* | | | Merge pull request #12668 from arunagw/aa-improvmentsRafael Mendonça França2013-10-272-7/+18
|\ \ \ \
| * | | | Fixed tests for app_generatorArun Agrawal2013-10-272-7/+18
|/ / / /
* | | | 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 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
|\ \ \ \ \ \