aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixed HABTM's CollectionAssociation sizeFred Wu2014-05-084-1/+30
* Merge pull request #15020 from ivantsepp/contributing_to_rails_guide_fixGodfrey Chan2014-05-071-1/+1
|\
| * Branch name should match in text and code example.Ivan Tse2014-05-081-1/+1
|/
* Merge pull request #15016 from arthurnn/dup_attr_on_save_stateGodfrey Chan2014-05-071-1/+1
|\
| * Dup the changed_attributes otherwise we could lose themArthur Neves2014-05-071-1/+1
|/
* Merge pull request #15015 from pothibo/database-configurationRafael Mendonça França2014-05-073-1/+22
|\
| * Use Rails::Paths::Path#existent in database_configurationPier-Olivier Thibault2014-05-073-1/+22
* | Add CHANGELOG entry for #14989Rafael Mendonça França2014-05-071-0/+5
* | Return a non zero code when db has never been setup on statusPaul B2014-05-072-3/+2
* | Merge pull request #12746 from coreyward/masterRafael Mendonça França2014-05-072-15/+36
|\ \
| * | Fix Hash#deep_merge bug and improve documentation — resolves #12738Corey Ward2013-12-092-11/+31
* | | Merge branch 'rm-trasaction-fix-13166'Rafael Mendonça França2014-05-073-0/+52
|\ \ \ | |_|/ |/| |
| * | Keep track of dirty attrs after after rollback.Arthur Neves2014-05-074-20/+11
| * | Merge pull request #13166 from bogdan/transaction-magicRafael Mendonça França2014-05-073-1/+62
|/| |
| * | Fix bugs with changed attributes tracking when transaction gets rollbackBogdan Gusiev2013-12-043-1/+62
* | | Merge pull request #15012 from schneems/schneems/headers-keyYves Senn2014-05-072-1/+5
|\ \ \
| * | | HTTP::Headers#key? correctly convertsschneems2014-05-072-1/+5
* | | | test for inconsistency between String and Symbol url_for handlingAaron Patterson2014-05-071-0/+4
* | | | add tests for symbols passed to polymorphic_urlAaron Patterson2014-05-071-0/+12
|/ / /
* | | test, persist inherited class with different table name. Refs #14971.Yves Senn2014-05-071-0/+14
* | | Merge pull request #15002 from vanderhoop/masterArthur Neves2014-05-071-2/+2
|\ \ \
| * | | fixed typos in active_record basics [skip ci]vanderhoop2014-05-071-2/+2
|/ / /
* | | Merge pull request #14964 from zuhao/refactor_actionmailer_testsYves Senn2014-05-071-102/+157
|\ \ \
| * | | Fix state leaks in actionmailer/test/base_test.rb.Zuhao Wan2014-05-071-102/+157
* | | | Merge pull request #15007 from vipulnsward/fix-scrubber-overshadowYves Senn2014-05-071-1/+1
|\ \ \ \
| * | | | rename `str` to `string` to fix overshadowing of variableVipul A M2014-05-071-1/+1
* | | | | Merge pull request #14993 from jonatack/patch-7Yves Senn2014-05-071-10/+9
|\ \ \ \ \
| * | | | | Follow-up to #14990 [ci skip]Jon Atack2014-05-071-10/+9
|/ / / / /
* / / / / Update links to new rails version in guides [ci skip]Arun Agrawal2014-05-071-1/+1
|/ / / /
* | | | Merge pull request #15004 from JuanitoFatas/patch/ar-pgYves Senn2014-05-071-3/+12
|\ \ \ \
| * | | | [ci skip] Add feature section and normalize prologue with other guides.Juanito Fatas2014-05-071-3/+12
|/ / / /
* | | | apparently passing a string to polymorphic_url is something we supportAaron Patterson2014-05-061-0/+12
* | | | make sure url_for works similar to polymorphic_urlAaron Patterson2014-05-061-38/+43
* | | | add a test for the parameters sent to the url helper for new recordsAaron Patterson2014-05-061-0/+15
* | | | Merge pull request #15000 from gregmolnar/guides_fixArthur Nogueira Neves2014-05-061-1/+4
|\ \ \ \
| * | | | fix guides mobile nav issue [ci skip]Greg Molnar2014-05-061-1/+4
|/ / / /
* | | | typo [ci skip]Xavier Noria2014-05-061-1/+1
* | | | Merge pull request #14997 from jpcody/nested_value_i18nRafael Mendonça França2014-05-064-2/+44
|\ \ \ \
| * | | | Include label value in i18n attribute lookupJoshua Cody2014-05-064-2/+44
* | | | | Merge pull request #14998 from arthurnn/tests_for_process_returnRafael Mendonça França2014-05-062-9/+13
|\ \ \ \ \
| * | | | | Ensure that .process return the method returnArthur Neves2014-05-062-9/+13
* | | | | | several enhancements to humanize [closes #12288]Xavier Noria2014-05-064-19/+68
* | | | | | Merge pull request #14982 from eric-chahin/GBV_refactorRafael Mendonça França2014-05-062-8/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Refactor AssociationScope#get_bind_valuesEric Chahin2014-05-052-8/+6
* | | | | | Merge pull request #14945 from tomkadwill/form_authenticity_param_refactorRafael Mendonça França2014-05-063-6/+34
|\ \ \ \ \ \
| * | | | | | Moved 'params[request_forgery_protection_token]' into its own method and impr...Tom Kadwill2014-05-063-6/+34
* | | | | | | Only accept actions without File::SEPARATOR in the name.Rafael Mendonça França2014-05-062-4/+41
|/ / / / / /
* | | | | | Merge pull request #14990 from fredwu/has_many_through_association_doc_grammarYves Senn2014-05-061-1/+1
|\ \ \ \ \ \
| * | | | | | Fixed grammarFred Wu2014-05-061-1/+1
|/ / / / / /
* | | | | | Merge branch 'postgres/guide'Yves Senn2014-05-061-0/+338
|\ \ \ \ \ \