Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | never merge url options in to the first data hash | Aaron Patterson | 2014-05-01 | 1 | -1/+1 | |
* | | | | | | Merge pull request #14896 from jetthoughts/14895_overide_strict_by_sql_mode | Rafael Mendonça França | 2014-05-01 | 4 | -5/+30 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Stringify variables names for mysql connections | Paul Nikitochkin | 2014-04-30 | 4 | -5/+30 | |
* | | | | | | | Merge pull request #14932 from phoet/use_file_join | Rafael Mendonça França | 2014-05-01 | 3 | -2/+20 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | always use File.join | phoet | 2014-05-01 | 3 | -2/+20 | |
* | | | | | | | | Merge pull request #14931 from heironimus/security_guide_clarity | Jeremy Kemper | 2014-05-01 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | [ci skip] Security guide clarity. | Kyle Heironimus | 2014-05-01 | 1 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #14915 from juanpastas/patch-1 | Rafael Mendonça França | 2014-05-01 | 1 | -20/+37 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [skip ci] Document: required `via` option in `match` routing method. | Juan David Pastas | 2014-04-30 | 1 | -20/+37 | |
* | | | | | | | | Merge pull request #12651 from cespare/ipv6-remote-ip-fixes | Rafael Mendonça França | 2014-05-01 | 3 | -2/+13 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Make remote_ip detection properly handle private IPv6 addresses | Caleb Spare | 2013-10-26 | 3 | -2/+13 | |
* | | | | | | | | | Remove unused variable | Rafael Mendonça França | 2014-05-01 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #13640 from maginatics/fix_sqlite3_ensure_master | Rafael Mendonça França | 2014-05-01 | 3 | -3/+27 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | SQLite3: Always close statements. | Timur Alperovich | 2014-01-15 | 3 | -3/+27 | |
* | | | | | | | | | | Merge pull request #14928 from potomak/update-scaffold-form-template | Rafael Mendonça França | 2014-05-01 | 1 | -5/+0 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Avoid unnecessary conditional block | Giovanni Cappellotto | 2014-05-01 | 1 | -5/+0 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #14922 from rizwanreza/add-selected-documentation-to-selec... | Rafael Mendonça França | 2014-05-01 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Add documentation to select_tag for :selected option | Rizwan Reza | 2014-04-30 | 1 | -1/+5 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #14916 from moktin/real_privacy_for_functions_in_predicate... | Matthew Draper | 2014-05-01 | 2 | -7/+12 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Give real privacy to class methods in AR::PredicateBuilder | Hector Satre | 2014-05-01 | 2 | -7/+12 | |
|/ / / / / / / / | ||||||
* | | | | | | | | avoid calling extract_record multiple times | Aaron Patterson | 2014-04-30 | 1 | -3/+2 | |
* | | | | | | | | eliminate conditional when sending the named route method | Aaron Patterson | 2014-04-30 | 1 | -2/+4 | |
* | | | | | | | | do not allocate strings while creating urls | Aaron Patterson | 2014-04-30 | 1 | -1/+1 | |
* | | | | | | | | don't allocate string on hash access | Aaron Patterson | 2014-04-30 | 1 | -1/+1 | |
| |_|_|/ / / / |/| | | | | | | ||||||
* | | | | | | | split nil / Hash cases in url_for | Aaron Patterson | 2014-04-30 | 1 | -4/+4 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #14909 from jonatack/patch-7 | Arthur Nogueira Neves | 2014-04-29 | 1 | -2/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | the use of ... in place >> using ... instead | Jon Atack | 2014-04-30 | 1 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | rewrites the API docs of favicon_link_tag [ci skip] | Xavier Noria | 2014-04-29 | 1 | -9/+16 | |
* | | | | | | Merge pull request #14905 from jonatack/patch-7 | Vijay Dev | 2014-04-29 | 1 | -36/+159 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Update the Getting Started tutorial | Jon Atack | 2014-04-29 | 1 | -36/+159 | |
* | | | | | | | cleanup, remove trailing whitespace. [ci skip] | Yves Senn | 2014-04-29 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #14899 from eileencodes/fix-delete-all-with-nil-dependency... | Aaron Patterson | 2014-04-28 | 4 | -8/+18 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | add test to check that loaded and non laoded are the same | eileencodes | 2014-04-28 | 1 | -0/+13 | |
| * | | | | | | clear shouldnt fire callbacks so remove order test | eileencodes | 2014-04-28 | 1 | -3/+0 | |
| * | | | | | | rewrite test to correctly test clear method | eileencodes | 2014-04-28 | 1 | -2/+2 | |
| * | | | | | | flip conditional in delete_all to handle nullify better | eileencodes | 2014-04-28 | 1 | -3/+3 | |
* | | | | | | | Merge pull request #14139 from anilmaurya/master | Yves Senn | 2014-04-28 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | [ci skip] updating active_record/associations to demonstrate where conflict w... | anilmaurya | 2014-04-29 | 1 | -0/+6 | |
* | | | | | | | Merge pull request #14892 from eileencodes/breakup-complex-conditionals-on-de... | Aaron Patterson | 2014-04-28 | 1 | -9/+9 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | simplify the delete all w/ dependency method | eileencodes | 2014-04-28 | 1 | -3/+3 | |
| * | | | | | | | remove unnecessary code from delete method | eileencodes | 2014-04-28 | 1 | -10/+2 | |
| * | | | | | | | write a new method to be accessed from delete_all | eileencodes | 2014-04-28 | 1 | -1/+9 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #14890 from fuzzyalej/patch-1 | Arthur Nogueira Neves | 2014-04-28 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Added a missing `end` | Alejandro Andrés | 2014-04-28 | 1 | -0/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #14889 from kiela/master | Arthur Nogueira Neves | 2014-04-28 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove double declaration of memcache services on travis | Kamil Kieliszczyk | 2014-04-28 | 1 | -1/+0 | |
|/ / / / / / / | ||||||
* | | | | | | | Revert "Don't rely on Arel master in bug report template [ci skip]" | Godfrey Chan | 2014-04-27 | 1 | -0/+1 | |
* | | | | | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-04-27 | 2 | -1/+55 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Revert "Running AR tests on postgres, mysql & sqlite" | Vijay Dev | 2014-04-27 | 1 | -5/+10 | |
| * | | | | | | | Revert "Document ActionController::TestCase::Behavior::ClassMethods.process" | Vijay Dev | 2014-04-27 | 1 | -12/+0 |