aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* test, persist inherited class with different table name. Refs #14971.Yves Senn2014-05-071-0/+14
| | | | | This case prevents against regressions. The change was suggested in a recent PR but the all our tests passed.
* Merge pull request #15002 from vanderhoop/masterArthur Neves2014-05-071-2/+2
|\ | | | | | | typo fixes in active_record_basics.md [skip ci]
| * 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
|\ | | | | WIP: Make ActionMailer tests order-independent.
| * 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 var to fix overshadowing of variable
| * | 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]
| * | | Follow-up to #14990 [ci skip]Jon Atack2014-05-071-10/+9
|/ / / | | | | | | | | | | | | | | | | | | | | | Rewrite to avoid 'we'/'you', add missing period, and keep lines at 80 chars. Cheers :) Improve readability with help from @senny [ci skip]
* / / 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.
| * | [ci skip] Add feature section and normalize prologue with other guides.Juanito Fatas2014-05-071-3/+12
|/ / | | | | | | | | | | Also change Json => JSON. Fill Ruby's Range & IPAddr link.
* | apparently passing a string to polymorphic_url is something we supportAaron Patterson2014-05-061-0/+12
| | | | | | | | o_O
* | 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
| * | 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 lookup
| * | Include label value in i18n attribute lookupJoshua Cody2014-05-064-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, only the object and method name from the label tag were used when looking up the translation for a label. If a value is given for the label, this ought to be additionally used. The following: # form.html.erb <%= form_for @post do |f| %> <%= f.label :type, value: "long" %> <% end %> # en.yml en: activerecord: attributes: post/long: "Long-form Post" Used to simply return "long", but now it will return "Long-form Post".
* | | Merge pull request #14998 from arthurnn/tests_for_process_returnRafael Mendonça França2014-05-062-9/+13
|\ \ \ | | | | | | | | Ensure that .process return the method return
| * | | Ensure that .process return the method returnArthur Neves2014-05-062-9/+13
| | | |
* | | | several enhancements to humanize [closes #12288]Xavier Noria2014-05-064-19/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Strips leading underscores. * Changes some unnecessary gsub!s to sub!s. * Replaces some anchors ^, $ with \A, \z. * Documents that human inflection rules are applied. * Documents that words are downcased except acronyms. * Adds an example with an acronym. * Rewords docs.
* | | | Merge pull request #14982 from eric-chahin/GBV_refactorRafael Mendonça França2014-05-062-8/+6
|\ \ \ \ | |/ / / |/| | | Refactored AssociationScope#get_bind_values
| * | | Refactor AssociationScope#get_bind_valuesEric Chahin2014-05-052-8/+6
| | | | | | | | | | | | | | | | Added #join_id_for(owner) to reflection to avoid accessing the source_macro
* | | | 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...
| * | | | Moved 'params[request_forgery_protection_token]' into its own method and ↵Tom Kadwill2014-05-063-6/+34
| | | | | | | | | | | | | | | | | | | | improved tests.
* | | | | Only accept actions without File::SEPARATOR in the name.Rafael Mendonça França2014-05-062-4/+41
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will avoid directory traversal in implicit render. Fixes: CVE-2014-0130 Conflicts: actionpack/lib/abstract_controller/base.rb
* | | | Merge pull request #14990 from fredwu/has_many_through_association_doc_grammarYves Senn2014-05-061-1/+1
|\ \ \ \ | | | | | | | | | | Fixed grammar [ci skip]
| * | | | Fixed grammarFred Wu2014-05-061-1/+1
|/ / / /
* | | | Merge branch 'postgres/guide'Yves Senn2014-05-061-0/+338
|\ \ \ \
| * | | | pg guides, some stylistic changes [ci skip]Yves Senn2014-05-061-20/+21
| | | | |
| * | | | pg guide, advanced features [ci skip]Yves Senn2014-05-061-18/+46
| | | | |
| * | | | pg guide, datatypes and examples. [ci skip]Yves Senn2014-05-061-0/+309
|/ / / /
* | | | Merge pull request #12667 from nateberkopec/make_guides_html_validYves Senn2014-05-0611-17/+18
|\ \ \ \ | | | | | | | | | | Fix Guide HTML validation
| * | | | Guides: output valid HTML5Nate Berkopec2014-05-0511-17/+18
| |/ / / | | | | | | | | [ci skip]
* | | | Merge pull request #14984 from jkingdon/add-jdbcmysqlRafael Mendonça França2014-05-051-1/+1
|\ \ \ \ | | | | | | | | | | Fix rails dbconsole for jdbcmysql adapter
| * | | | Fix rails dbconsole for jdbcmysql adapter.Gabriel Gilder and Jim Kingdon2014-05-051-1/+1
| | |/ / | |/| |
* | | | Merge pull request #14985 from eileencodes/refactor-delete-all-methodGuillermo Iguaran2014-05-051-9/+1
|\ \ \ \ | |/ / / |/| | | refactor and clean up delete_all method
| * | | refactor and clean up delete_all methodeileencodes2014-05-051-9/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Now that delete_all with destroy or delete_all dependency behave the same we no longer need this conditional. This means we can remove the new delete_all_with_dependency method I added and go straight to delete_records from delete_all, passing :all and the dependent directly.
* | | Merge pull request #14951 from jenrzzz/module_table_name_suffixCarlos Antonio da Silva2014-05-054-1/+63
|\ \ \ | |/ / |/| | Add support for module-level table_suffix in models
| * | Add support for module-level table_suffix in modelsJenner LaFave2014-05-054-1/+63
|/ / | | | | | | | | This makes table_name_suffix work the same as table_name_prefix when using namespaced models. Pretty much the same as 67d1cec.
* | Improve CHANGELOG entry [ci skip]Rafael Mendonça França2014-05-051-3/+3
| |
* | Merge pull request #14978 from bogdan/relation-joinRafael Mendonça França2014-05-055-2/+17
|\ \ | | | | | | | | | [Regression 4.0 -> 4.1] Put back Relation#join method as a delegate to Array
| * | Put back Relation#join method as a delegate to ArrayBogdan Gusiev2014-05-055-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | This is a regression 4.0 -> 4.1 fix. In 4.1.0 Relation#join is delegated to Arel#SelectManager. In 4.0 series it is delegated to Array#join This patch puts back the behaviour of 4.0
* | | Get rid of unused method in AR Post test modelCarlos Antonio da Silva2014-05-051-4/+0
| | |
* | | Get rid of extra local var that does not add to the logicCarlos Antonio da Silva2014-05-051-2/+2
|/ / | | | | | | There are too many "action name" variables around the process method.
* | Arel master is 6.0.0Rafael Mendonça França2014-05-051-1/+1
| |
* | Improve CHANGELOG entryRafael Mendonça França2014-05-041-2/+2
| |
* | Use assert_raisesRafael Mendonça França2014-05-041-3/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 02:52:49 +0000