aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Do not use short-circuit returnRafael Mendonça França2014-05-041-2/+3
|
* Merge pull request #11166 from xavier/callable_constraint_verificationRafael Mendonça França2014-05-043-0/+29
|\ | | | | | | | | | | | | Callable route constraint verification Conflicts: actionpack/CHANGELOG.md
| * Verify that route constraints respond to the expected messages instead of ↵Xavier Defrang2013-06-283-0/+29
| | | | | | | | silently failing to enforce the constraint
* | Improve CHANGELOG [ci skip]Rafael Mendonça França2014-05-041-2/+2
| |
* | No need the else clauseRafael Mendonça França2014-05-041-2/+0
| |
* | Merge pull request #14949 from bogdan/empty-hash-array-parameterizationRafael Mendonça França2014-05-043-9/+22
|\ \ | | | | | | [Fixes #14948] Hash#to_query: right serialization for empty hash and array
| * | [Fixes #14948] Hash#to_query: Changed a way how empty hash and empty array ↵Bogdan Gusiev2014-05-033-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are serialized Empty Hash or Array should not present in serialization result {a: []}.to_query # => "" {a: {}}.to_query # => "" For more info see #14948.
* | | Invert the if/else clauseRafael Mendonça França2014-05-041-1/+1
| | | | | | | | | | | | The case where the value is present is more common
* | | Merge pull request #14946 from jcoleman/fix-null-binary-column-logging-exceptionRafael Mendonça França2014-05-043-1/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix exception when logging SQL w/ nil binary value. Conflicts: activerecord/CHANGELOG.md
| * | | Fix exception when logging SQL w/ nil binary value.James Coleman2014-05-023-1/+20
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 03:14:16 +0000