aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* no need for a CHANGELOG entry. [ci skip].Yves Senn2013-10-301-7/+1
* fix code typo in `MysqlAdapter` .Closes #12647.Yves Senn2013-10-303-1/+22
* Merge pull request #12702 from dmathieu/finetune_session_fetchRafael Mendonça França2013-10-302-2/+8
|\
| * session#fetch doesn't behave exactly like Hash#fetch.Damien Mathieu2013-10-302-2/+8
|/
* Merge pull request #12687 from notalex/masterYves Senn2013-10-301-7/+12
|\
| * Update pull request instructions as per the new Github UIAlex Johnson2013-10-301-7/+12
|/
* Merge pull request #12653 from releu/short_arrays_in_inspectYves Senn2013-10-303-3/+19
|\
| * short arrays in inspectJan Bernacki2013-10-303-3/+19
|/
* Merge pull request #12692 from dmathieu/session_fetchGuillermo Iguaran2013-10-293-0/+37
|\
| * add the fetch method to sessionsDamien Mathieu2013-10-293-0/+37
* | Merge pull request #12693 from carpodaster/convert-cdata-input-to-stringRafael Mendonça França2013-10-292-1/+5
|\ \ | |/ |/|
| * Convert CDATA input to string before gsub'ingCarsten Zimmermann2013-10-292-1/+5
|/
* Merge pull request #12690 from durrantm/minor_README_changeYves Senn2013-10-291-1/+1
|\
| * Clarify that visiting http://localhost:3000 should be done in a browser.Michael Durrant2013-10-291-1/+1
|/
* Merge pull request #12688 from simi/patch-1Rafael Mendonça França2013-10-291-1/+1
|\
| * Update testing.rake with more accurate description of test task.Josef Šimánek2013-10-291-1/+1
|/
* Revert "add active model basics wip to guides/documents.yaml"Xavier Noria2013-10-291-6/+0
* Merge pull request #10664 from aderyabin/docpatchYves Senn2013-10-291-1/+1
|\
| * Fix doc in Postgres database creationAndrey Deryabin2013-06-251-1/+1
* | Fix broken delete_all test, which will now be failing since #delete_all is br...David Heinemeier Hansson2013-10-281-4/+4
* | Add failing test for preloading with a polymorphic association and using the ...David Heinemeier Hansson2013-10-281-1/+10
* | Remove confusing generated-code commentaryJeremy Kemper2013-10-281-4/+4
* | 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