| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | Bump Journey requirements to 1.0.4 | Andrew White | 2012-07-23 | 1 | -1/+1 |
* | | Hash#fetch(fetch) is not the same as doing hash[key] | Xavier Noria | 2012-07-21 | 1 | -1/+11 |
* | | `validates_inclusion_of` and `validates_exclusion_of` now accept | Rafael Mendonça França | 2012-07-20 | 5 | -10/+60 |
* | | Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql. | Jon Leighton | 2012-07-20 | 8 | -35/+108 |
* | | Merge pull request #6616 from dpassage/fix_resolver_test_sqlite3 | Carlos Antonio da Silva | 2012-07-19 | 1 | -0/+3 |
* | | Merge pull request #7108 from arunagw/mocha_bump | Rafael Mendonça França | 2012-07-19 | 1 | -1/+1 |
|\ \ |
|
| * | | Bumping mocha! | Arun Agrawal | 2012-07-19 | 1 | -1/+1 |
| |/ |
|
* | | Merge pull request #7080 from jfirebaugh/to_param_regression | Jon Leighton | 2012-07-17 | 2 | -1/+7 |
|\ \ |
|
| * | | AR::Integration must be included after AM::Conversion | John Firebaugh | 2012-07-17 | 2 | -1/+7 |
|/ / |
|
* | | Add support for optional root segments containing slashes | Andrew White | 2012-07-17 | 2 | -1/+27 |
* | | Merge pull request #4396 from kennyj/fix_4259 | Rafael Mendonça França | 2012-07-17 | 2 | -4/+40 |
|/ |
|
* | adds a missing require [fixes #6896] | Xavier Noria | 2012-07-15 | 2 | -1/+1 |
* | fixing tests to deal with data differences between prepared statements and no... | Aaron Patterson | 2012-07-13 | 3 | -3/+8 |
* | Fixing texts; down to three failing tests. | Jeremy Cole | 2012-07-13 | 2 | -15/+24 |
* | Only use prepared statements when bind variables are present | Jeremy Cole | 2012-07-13 | 1 | -34/+40 |
* | Merge pull request #7031 from robbkidd/rename_sequences_too_backport_to_3-2 | Piotr Sarnacki | 2012-07-11 | 2 | -0/+27 |
|\ |
|
| * | Update psql adapter to rename a default pkey sequence during rename_table. | Robb Kidd | 2012-07-10 | 2 | -0/+27 |
|/ |
|
* | Merge pull request #7025 from rustygeldmacher/select_options_valid_html | Rafael Mendonça França | 2012-07-10 | 2 | -5/+18 |
|\ |
|
| * | Fixed bug creating invalid HTML in select options | Rusty Geldmacher | 2012-07-10 | 2 | -5/+18 |
|/ |
|
* | Merge pull request #7015 from sikachu/3-2-stable-code-style | Xavier Noria | 2012-07-09 | 1 | -8/+8 |
|\ |
|
| * | Update coding convention from master | Prem Sichanugrist | 2012-07-09 | 1 | -8/+8 |
|/ |
|
* | Merge pull request #6985 from sidonath/disable-query-cache-for-locks | Rafael Mendonça França | 2012-07-06 | 2 | -1/+17 |
* | Since Rails 3.2, use layout false to render no layout | José Valim | 2012-07-06 | 1 | -1/+1 |
* | Merge pull request #6973 from route/wrapped_keys_in_log_for_3_2 | Rafael Mendonça França | 2012-07-05 | 2 | -1/+10 |
|\ |
|
| * | Show in log correct wrapped keys | Dmitry Vorotilin | 2012-07-05 | 2 | -1/+10 |
|/ |
|
* | Fix NumberHelper options wrapping to prevent verbatim blocks being rendered i... | Mark J. Titorenko | 2012-07-02 | 1 | -90/+159 |
* | Merge pull request #6935 from frodsan/b1e509ad7a8c8264544f10f4666705cd806b5408 | Rafael Mendonça França | 2012-07-02 | 2 | -15/+31 |
|\ |
|
| * | Backport #3329 to 3-2-stable | Francesco Rodriguez | 2012-07-02 | 2 | -15/+31 |
|/ |
|
* | make sure the inflection rules are loaded when cherry-picking active_support/... | Xavier Noria | 2012-06-29 | 3 | -0/+5 |
* | Merge pull request #6878 from masarakki/master | Rafael Mendonça França | 2012-06-28 | 5 | -0/+41 |
* | Merge pull request #6900 from cbandy/issue-6898 | Carlos Antonio da Silva | 2012-06-28 | 1 | -0/+2 |
* | Merge pull request #6857 from rsutphin/as_core_ext_time_missing_require | Carlos Antonio da Silva | 2012-06-25 | 1 | -0/+1 |
* | Ensure Arel columns are typecasted properly when grouping with calculation | Carlos Antonio da Silva | 2012-06-25 | 2 | -5/+9 |
* | Merge pull request #6842 from ernie/handle-non-strings-in-grouped-calculations | Rafael Mendonça França | 2012-06-24 | 2 | -6/+22 |
* | Remove waning of unused variable | Rafael Mendonça França | 2012-06-21 | 1 | -1/+0 |
* | Merge branch 'acapilleri-update_nested_attributes' | Rafael Mendonça França | 2012-06-21 | 2 | -5/+25 |
* | Merge pull request #6758 from caironoleto/master | José Valim | 2012-06-18 | 1 | -13/+13 |
* | Merge pull request #6649 from route/logger_in_metal_3_2 | Carlos Antonio da Silva | 2012-06-18 | 2 | -2/+21 |
|\ |
|
| * | Added test for case when view doesn't have logger method when using ActionCon... | Dmitry Vorotilin | 2012-06-16 | 1 | -0/+17 |
| * | ActionController::Metal doesn't have logger method, check it and then delegate | Dmitry Vorotilin | 2012-06-16 | 1 | -2/+4 |
* | | Merge pull request #6742 from steveklabnik/deprecate_composed_of | Rafael Mendonça França | 2012-06-18 | 5 | -7/+24 |
|\ \ |
|
| * | | Deprecating composed_of in ActiveRecord | Steve Klabnik | 2012-06-18 | 5 | -7/+24 |
| |/ |
|
* | | Use strict_args_position! if available from Thor | José Valim | 2012-06-18 | 1 | -0/+1 |
* | | Merge pull request #6764 from frodsan/patch-4 | Rafael Mendonça França | 2012-06-17 | 1 | -2/+2 |
|\ \ |
|
| * | | bump AS deprecation_horizon to 4.0 | Francesco Rodríguez | 2012-06-17 | 1 | -2/+2 |
|/ / |
|
* | | Merge pull request #6756 from arunagw/build_fix_ap | Rafael Mendonça França | 2012-06-16 | 1 | -1/+1 |
|\ \ |
|
| * | | It should also include text/css => Build Fix | Arun Agrawal | 2012-06-16 | 1 | -1/+1 |
|/ / |
|
* / | Merge pull request #6752 from steveklabnik/fix_5680 | Rafael Mendonça França | 2012-06-16 | 3 | -4/+21 |
|/ |
|
* | Remove unneded tests. | Rafael Mendonça França | 2012-06-14 | 1 | -11/+1 |
* | registers the deprecation of update_attribute in the CHANGELOG | Xavier Noria | 2012-06-14 | 1 | -0/+8 |