aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Change @env_config to @app_env_configEvan Phoenix2013-03-181-1/+1
|/ / /
* | | Merge pull request #9785 from claudiob/add-3-2-13-release-date-to-changelogsRafael Mendonça França2013-03-187-8/+8
|\ \ \
| * | | Add release dates to documentation [ci skip]claudiob2013-03-187-8/+8
|/ / /
* | | Bring back test and changelog entry from #pluck method and select clauseCarlos Antonio da Silva2013-03-182-0/+16
* | | Fix method name indent [ci skip]Carlos Antonio da Silva2013-03-181-1/+1
* | | Fix changelog conflicts and remove release dates [ci skip]Carlos Antonio da Silva2013-03-183-14/+8
* | | Merge branch '3-2-13' into 3-2-stableAaron Patterson2013-03-1828-50/+98
|\ \ \
| * | | bumping to 3.2.13Aaron Patterson2013-03-189-9/+9
| * | | fix protocol checking in sanitization [CVE-2013-1857]Aaron Patterson2013-03-152-2/+12
| * | | JDOM XXE Protection [CVE-2013-1856]Ben Murphy2013-03-155-3/+45
| * | | fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]Charlie Somerville2013-03-152-3/+8
| * | | stop calling to_sym when building arel nodes [CVE-2013-1854]Aaron Patterson2013-03-154-10/+10
| |/ /
| * | Merge pull request #9616 from exviva/multiple_select_name_double_square_bracketsCarlos Antonio da Silva2013-03-123-1/+26
| * | bumping to rc2Aaron Patterson2013-03-069-9/+9
| * | Revert "Merge pull request #8209 from senny/backport_8176"Aaron Patterson2013-03-052-21/+0
| * | Freeze columns only once per ResultSantiago Pastorino2013-03-051-3/+9
| * | Preparing for 3.2.13.rc1 releaseSteve Klabnik2013-02-279-17/+17
| * | Update CHANGELOGs for 3.2.13 release.Steve Klabnik2013-02-277-0/+35
* | | Merge pull request #9768 from senny/do_not_freeze_number_helper_defaultsCarlos Antonio da Silva2013-03-181-2/+2
|\ \ \
| * | | do not freeze NumberHelper defaults.Yves Senn2013-03-181-2/+2
|/ / /
* | | Typo fix [ci ski]Justin2013-03-151-2/+2
* | | Merge pull request #7368 from jbarreneche/bug/render-locale-fallbacksSteve Klabnik2013-03-143-1/+21
|\ \ \
| * | | Extract hardcoded lists to Redo::RestaurantsListJuan Barreneche2013-03-143-1/+21
|/ / /
* | | Fix ar:mysql2 build on Ruby 1.8.7Andrew White2013-03-131-4/+12
* | | Fix `ActiveSupport::TimeZone.parse` when time is a local DST jumpAndrew White2013-03-133-7/+76
* | | Merge pull request #9616 from exviva/multiple_select_name_double_square_bracketsCarlos Antonio da Silva2013-03-093-2/+27
* | | Merge pull request #9613 from arunagw/remove_fixmeCarlos Antonio da Silva2013-03-081-9/+8
|\ \ \
| * | | Removing FIXMEArun Agrawal2013-03-081-9/+8
* | | | Merge pull request #9609 from arunagw/using-latest-arjdbcCarlos Antonio da Silva2013-03-081-3/+3
|\ \ \ \
| * | | | Using latest AR-JDBC for JRubyArun Agrawal2013-03-081-3/+3
| |/ / /
* | | | Merge pull request #9600 from larrylv/fix-load-target-with-identity-map-onRafael Mendonça França2013-03-071-3/+8
|\ \ \ \
| * | | | @target might be nil when Identity Map is enabled.Larry Lv2013-03-081-3/+8
|/ / / /
* | | | Merge pull request #9549 from larrylv/reload-stable-target-before-savingRafael Mendonça França2013-03-076-6/+28
|\ \ \ \
| * | | | Fix issue #7526. Reload the target if it's stale.larrylv2013-03-056-6/+28
* | | | | Merge pull request #9594 from yahonda/3-2-stable_prefix_suffixRafael Mendonça França2013-03-071-4/+5
|\ \ \ \ \
| * | | | | Use shorter prefix and suffix as in Oracle database identifierYasuo Honda2013-03-071-4/+5
|/ / / / /
* | | | | Update CHANGELOGs for 3.2.13.rc1Steve Klabnik2013-03-057-0/+30
* | | | | Merge pull request #9543 from maximerety/backport_fix_7774Carlos Antonio da Silva2013-03-053-2/+16
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Backport fixes about #7774 to 3-2-stablemaximerety2013-03-053-2/+16
|/ / / /
* | | | Merge pull request #9531 from erik-escobedo/patch-1Guillermo Iguaran2013-03-031-1/+1
|\ \ \ \
| * | | | Fix typo on CHANGELOG.mdÉrik Escobedo2013-03-031-1/+1
* | | | | Merge pull request #9528 from korny/patch-1Andrew White2013-03-031-2/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove unused path_without_format variableKornelius Kalnbach2013-03-031-2/+0
|/ / / /
* | | | Freeze columns only once per ResultSantiago Pastorino2013-03-031-3/+9
* | | | Update docs, change_table does not use TableDefinition.Yves Senn2013-02-281-2/+2
* | | | Improve AR changelog [ci skip]Carlos Antonio da Silva2013-02-281-2/+5
* | | | Merge pull request #9485 from authorNari/backport-6755-to-3-2-stableCarlos Antonio da Silva2013-02-283-1/+16
|\ \ \ \
| * | | | Backported #6755 to 3-2-stable. Don't read csv file during executing db:fixtu...Narihiro Nakamura2013-02-283-1/+16
|/ / / /
* | | | Enforce i18n version >= v0.6.4Carlos Antonio da Silva2013-02-271-1/+1
* | | | Merge pull request #9472 from yahonda/revert_7544c7a9Rafael Mendonça França2013-02-271-3/+1
|\ \ \ \