Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Bring back test and changelog entry from #pluck method and select clause | Carlos Antonio da Silva | 2013-03-18 | 2 | -0/+16 | |
* | | | | Fix method name indent [ci skip] | Carlos Antonio da Silva | 2013-03-18 | 1 | -1/+1 | |
* | | | | Fix changelog conflicts and remove release dates [ci skip] | Carlos Antonio da Silva | 2013-03-18 | 3 | -14/+8 | |
* | | | | Merge branch '3-2-13' into 3-2-stable | Aaron Patterson | 2013-03-18 | 28 | -50/+98 | |
|\ \ \ \ | ||||||
| * | | | | bumping to 3.2.13 | Aaron Patterson | 2013-03-18 | 9 | -9/+9 | |
| * | | | | fix protocol checking in sanitization [CVE-2013-1857] | Aaron Patterson | 2013-03-15 | 2 | -2/+12 | |
| * | | | | JDOM XXE Protection [CVE-2013-1856] | Ben Murphy | 2013-03-15 | 5 | -3/+45 | |
| * | | | | fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] | Charlie Somerville | 2013-03-15 | 2 | -3/+8 | |
| * | | | | stop calling to_sym when building arel nodes [CVE-2013-1854] | Aaron Patterson | 2013-03-15 | 4 | -10/+10 | |
| |/ / / | ||||||
| * | | | Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets | Carlos Antonio da Silva | 2013-03-12 | 3 | -1/+26 | |
| * | | | bumping to rc2 | Aaron Patterson | 2013-03-06 | 9 | -9/+9 | |
| * | | | Revert "Merge pull request #8209 from senny/backport_8176" | Aaron Patterson | 2013-03-05 | 2 | -21/+0 | |
| * | | | Freeze columns only once per Result | Santiago Pastorino | 2013-03-05 | 1 | -3/+9 | |
| * | | | Preparing for 3.2.13.rc1 release | Steve Klabnik | 2013-02-27 | 9 | -17/+17 | |
| * | | | Update CHANGELOGs for 3.2.13 release. | Steve Klabnik | 2013-02-27 | 7 | -0/+35 | |
* | | | | Merge pull request #9768 from senny/do_not_freeze_number_helper_defaults | Carlos Antonio da Silva | 2013-03-18 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | do not freeze NumberHelper defaults. | Yves Senn | 2013-03-18 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Typo fix [ci ski] | Justin | 2013-03-15 | 1 | -2/+2 | |
* | | | | Merge pull request #7368 from jbarreneche/bug/render-locale-fallbacks | Steve Klabnik | 2013-03-14 | 3 | -1/+21 | |
|\ \ \ \ | ||||||
| * | | | | Extract hardcoded lists to Redo::RestaurantsList | Juan Barreneche | 2013-03-14 | 3 | -1/+21 | |
|/ / / / | ||||||
* | | | | Fix ar:mysql2 build on Ruby 1.8.7 | Andrew White | 2013-03-13 | 1 | -4/+12 | |
* | | | | Fix `ActiveSupport::TimeZone.parse` when time is a local DST jump | Andrew White | 2013-03-13 | 3 | -7/+76 | |
* | | | | Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets | Carlos Antonio da Silva | 2013-03-09 | 3 | -2/+27 | |
* | | | | Merge pull request #9613 from arunagw/remove_fixme | Carlos Antonio da Silva | 2013-03-08 | 1 | -9/+8 | |
|\ \ \ \ | ||||||
| * | | | | Removing FIXME | Arun Agrawal | 2013-03-08 | 1 | -9/+8 | |
* | | | | | Merge pull request #9609 from arunagw/using-latest-arjdbc | Carlos Antonio da Silva | 2013-03-08 | 1 | -3/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Using latest AR-JDBC for JRuby | Arun Agrawal | 2013-03-08 | 1 | -3/+3 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #9600 from larrylv/fix-load-target-with-identity-map-on | Rafael Mendonça França | 2013-03-07 | 1 | -3/+8 | |
|\ \ \ \ \ | ||||||
| * | | | | | @target might be nil when Identity Map is enabled. | Larry Lv | 2013-03-08 | 1 | -3/+8 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #9549 from larrylv/reload-stable-target-before-saving | Rafael Mendonça França | 2013-03-07 | 6 | -6/+28 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix issue #7526. Reload the target if it's stale. | larrylv | 2013-03-05 | 6 | -6/+28 | |
* | | | | | | Merge pull request #9594 from yahonda/3-2-stable_prefix_suffix | Rafael Mendonça França | 2013-03-07 | 1 | -4/+5 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Use shorter prefix and suffix as in Oracle database identifier | Yasuo Honda | 2013-03-07 | 1 | -4/+5 | |
|/ / / / / / | ||||||
* | | | | | | Update CHANGELOGs for 3.2.13.rc1 | Steve Klabnik | 2013-03-05 | 7 | -0/+30 | |
* | | | | | | Merge pull request #9543 from maximerety/backport_fix_7774 | Carlos Antonio da Silva | 2013-03-05 | 3 | -2/+16 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Backport fixes about #7774 to 3-2-stable | maximerety | 2013-03-05 | 3 | -2/+16 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #9531 from erik-escobedo/patch-1 | Guillermo Iguaran | 2013-03-03 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix typo on CHANGELOG.md | Érik Escobedo | 2013-03-03 | 1 | -1/+1 | |
* | | | | | | Merge pull request #9528 from korny/patch-1 | Andrew White | 2013-03-03 | 1 | -2/+0 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | remove unused path_without_format variable | Kornelius Kalnbach | 2013-03-03 | 1 | -2/+0 | |
|/ / / / / | ||||||
* | | | | | Freeze columns only once per Result | Santiago Pastorino | 2013-03-03 | 1 | -3/+9 | |
* | | | | | Update docs, change_table does not use TableDefinition. | Yves Senn | 2013-02-28 | 1 | -2/+2 | |
* | | | | | Improve AR changelog [ci skip] | Carlos Antonio da Silva | 2013-02-28 | 1 | -2/+5 | |
* | | | | | Merge pull request #9485 from authorNari/backport-6755-to-3-2-stable | Carlos Antonio da Silva | 2013-02-28 | 3 | -1/+16 | |
|\ \ \ \ \ | ||||||
| * | | | | | Backported #6755 to 3-2-stable. Don't read csv file during executing db:fixtu... | Narihiro Nakamura | 2013-02-28 | 3 | -1/+16 | |
|/ / / / / | ||||||
* | | | | | Enforce i18n version >= v0.6.4 | Carlos Antonio da Silva | 2013-02-27 | 1 | -1/+1 | |
* | | | | | Merge pull request #9472 from yahonda/revert_7544c7a9 | Rafael Mendonça França | 2013-02-27 | 1 | -3/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Revert "Skip test_remove_column_with_array_as_an_argument_is_deprecated with ... | Yasuo Honda | 2013-02-28 | 1 | -3/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #9471 from yahonda/5837_32-stable | Rafael Mendonça França | 2013-02-27 | 1 | -4/+4 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Fix ORA-00972 error at test_rename_table_with_prefix_and_suffix | Yasuo Honda | 2013-02-28 | 1 | -4/+4 | |
|/ / / / |