| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | Return a non zero code when db has never been setup on status | Paul B | 2014-05-07 | 2 | -3/+2 | |
| | | | | | ||||||
| * | | | | Merge pull request #12746 from coreyward/master | Rafael Mendonça França | 2014-05-07 | 2 | -15/+36 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | Fix Hash#deep_merge bug and improve documentation — resolves #12738 | |||||
| | * | | | | Fix Hash#deep_merge bug and improve documentation — resolves #12738 | Corey Ward | 2013-12-09 | 2 | -11/+31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously merging into a hash with a falsy value would not result in the merge-block being called. The fix is simply to check for presence of the key in the hash. The documentation example for `deep_merge` now appropriately demonstrates what a deep merge does. | |||||
| * | | | | | Merge branch 'rm-trasaction-fix-13166' | Rafael Mendonça França | 2014-05-07 | 3 | -0/+52 | |
| |\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| | * | | | | Keep track of dirty attrs after after rollback. | Arthur Neves | 2014-05-07 | 4 | -20/+11 | |
| | | | | | | | | | | | | | | | | | | | | | [related #13166] | |||||
| | * | | | | Merge pull request #13166 from bogdan/transaction-magic | Rafael Mendonça França | 2014-05-07 | 3 | -1/+62 | |
| |/| | | | | | | | | | | | | | | | | | | | [Regression 3.2 -> 4.0] Fix bugs with changed attributes tracking when transaction gets rollback | |||||
| | * | | | | Fix bugs with changed attributes tracking when transaction gets rollback | Bogdan Gusiev | 2013-12-04 | 3 | -1/+62 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #15012 from schneems/schneems/headers-key | Yves Senn | 2014-05-07 | 2 | -1/+5 | |
| |\ \ \ \ \ | | | | | | | | | | | | | HTTP::Headers#key? correctly converts | |||||
| | * | | | | | HTTP::Headers#key? correctly converts | schneems | 2014-05-07 | 2 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if you were looking for a given key, the header may incorrectly tell you that it did not exist even though it would return a valid value: ```ruby env = { "CONTENT_TYPE" => "text/plain" } headers = ActionDispatch::Http::Headers.new(env) headers["Content-Type"] # => "text/plain" headers.key?("Content-Type") # => false ``` This PR fixes that behavior by converting the key before checking for presence | |||||
| * | | | | | | test for inconsistency between String and Symbol url_for handling | Aaron Patterson | 2014-05-07 | 1 | -0/+4 | |
| | | | | | | | ||||||
| * | | | | | | add tests for symbols passed to polymorphic_url | Aaron Patterson | 2014-05-07 | 1 | -0/+12 | |
| |/ / / / / | ||||||
| * | | | | | test, persist inherited class with different table name. Refs #14971. | Yves Senn | 2014-05-07 | 1 | -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/master | Arthur Neves | 2014-05-07 | 1 | -2/+2 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | typo fixes in active_record_basics.md [skip ci] | |||||
| | * | | | | | fixed typos in active_record basics [skip ci] | vanderhoop | 2014-05-07 | 1 | -2/+2 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #14964 from zuhao/refactor_actionmailer_tests | Yves Senn | 2014-05-07 | 1 | -102/+157 | |
| |\ \ \ \ \ | | | | | | | | | | | | | WIP: Make ActionMailer tests order-independent. | |||||
| | * | | | | | Fix state leaks in actionmailer/test/base_test.rb. | Zuhao Wan | 2014-05-07 | 1 | -102/+157 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #15007 from vipulnsward/fix-scrubber-overshadow | Yves Senn | 2014-05-07 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | rename var to fix overshadowing of variable | |||||
| | * | | | | | | rename `str` to `string` to fix overshadowing of variable | Vipul A M | 2014-05-07 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #14993 from jonatack/patch-7 | Yves Senn | 2014-05-07 | 1 | -10/+9 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Follow-up to #14990 [ci skip] | |||||
| | * | | | | | | | Follow-up to #14990 [ci skip] | Jon Atack | 2014-05-07 | 1 | -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 Agrawal | 2014-05-07 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #15004 from JuanitoFatas/patch/ar-pg | Yves Senn | 2014-05-07 | 1 | -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 Fatas | 2014-05-07 | 1 | -3/+12 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Also change Json => JSON. Fill Ruby's Range & IPAddr link. | |||||
| * | | | | | apparently passing a string to polymorphic_url is something we support | Aaron Patterson | 2014-05-06 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | o_O | |||||
| * | | | | | make sure url_for works similar to polymorphic_url | Aaron Patterson | 2014-05-06 | 1 | -38/+43 | |
| | | | | | | ||||||
| * | | | | | add a test for the parameters sent to the url helper for new records | Aaron Patterson | 2014-05-06 | 1 | -0/+15 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #15000 from gregmolnar/guides_fix | Arthur Nogueira Neves | 2014-05-06 | 1 | -1/+4 | |
| |\ \ \ \ \ | | | | | | | | | | | | | fix guides mobile nav issue | |||||
| | * | | | | | fix guides mobile nav issue [ci skip] | Greg Molnar | 2014-05-06 | 1 | -1/+4 | |
| |/ / / / / | ||||||
| * | | | | | typo [ci skip] | Xavier Noria | 2014-05-06 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #14997 from jpcody/nested_value_i18n | Rafael Mendonça França | 2014-05-06 | 4 | -2/+44 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Include label value in i18n attribute lookup | |||||
| | * | | | | | Include label value in i18n attribute lookup | Joshua Cody | 2014-05-06 | 4 | -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_return | Rafael Mendonça França | 2014-05-06 | 2 | -9/+13 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Ensure that .process return the method return | |||||
| | * | | | | | | Ensure that .process return the method return | Arthur Neves | 2014-05-06 | 2 | -9/+13 | |
| | | | | | | | | ||||||
| * | | | | | | | several enhancements to humanize [closes #12288] | Xavier Noria | 2014-05-06 | 4 | -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_refactor | Rafael Mendonça França | 2014-05-06 | 2 | -8/+6 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Refactored AssociationScope#get_bind_values | |||||
| | * | | | | | | Refactor AssociationScope#get_bind_values | Eric Chahin | 2014-05-05 | 2 | -8/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added #join_id_for(owner) to reflection to avoid accessing the source_macro | |||||
| * | | | | | | | Merge pull request #14945 from tomkadwill/form_authenticity_param_refactor | Rafael Mendonça França | 2014-05-06 | 3 | -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 Kadwill | 2014-05-06 | 3 | -6/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improved tests. | |||||
| * | | | | | | | | Only accept actions without File::SEPARATOR in the name. | Rafael Mendonça França | 2014-05-06 | 2 | -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_grammar | Yves Senn | 2014-05-06 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixed grammar [ci skip] | |||||
| | * | | | | | | | Fixed grammar | Fred Wu | 2014-05-06 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge branch 'postgres/guide' | Yves Senn | 2014-05-06 | 1 | -0/+338 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | pg guides, some stylistic changes [ci skip] | Yves Senn | 2014-05-06 | 1 | -20/+21 | |
| | | | | | | | | | ||||||
| | * | | | | | | | pg guide, advanced features [ci skip] | Yves Senn | 2014-05-06 | 1 | -18/+46 | |
| | | | | | | | | | ||||||
| | * | | | | | | | pg guide, datatypes and examples. [ci skip] | Yves Senn | 2014-05-06 | 1 | -0/+309 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #12667 from nateberkopec/make_guides_html_valid | Yves Senn | 2014-05-06 | 11 | -17/+18 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix Guide HTML validation | |||||
| | * | | | | | | | Guides: output valid HTML5 | Nate Berkopec | 2014-05-05 | 11 | -17/+18 | |
| | |/ / / / / / | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | | | Merge pull request #14984 from jkingdon/add-jdbcmysql | Rafael Mendonça França | 2014-05-05 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix rails dbconsole for jdbcmysql adapter | |||||
| | * | | | | | | | Fix rails dbconsole for jdbcmysql adapter. | Gabriel Gilder and Jim Kingdon | 2014-05-05 | 1 | -1/+1 | |
| | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | | Merge pull request #14985 from eileencodes/refactor-delete-all-method | Guillermo Iguaran | 2014-05-05 | 1 | -9/+1 | |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | refactor and clean up delete_all method | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |