aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Don't reset inheritance_column when setting explicitly.Fred Wu2013-03-272-1/+13
|/ / /
* | | Merge pull request #9899 from macksmind/backport_5808Jeremy Kemper2013-03-243-6/+60
|\ \ \
| * | | Backport #5808Mack Earnhardt2013-03-243-6/+60
|/ / /
* | | Merge pull request #9873 from senny/use_old_hash_syntaxJon Leighton2013-03-221-1/+1
|\ \ \
| * | | use ruby 1.8 Hash syntax [ci skip]Yves Senn2013-03-221-1/+1
|/ / /
* | | Merge pull request #9870 from senny/9806_eager_loading_regressionJon Leighton2013-03-222-2/+8
|\ \ \
| * | | do not reset associations when preloading twice.Yves Senn2013-03-222-2/+8
|/ / /
* | | Fix test to Ruby 1.8Rafael Mendonça França2013-03-211-1/+1
* | | Improve CHANGELOG entry [ci skip]Rafael Mendonça França2013-03-211-1/+5
* | | Merge branch '3-2-stable' into fredwu-slow_view_loading_fixAaron Patterson2013-03-206-2/+32
|\ \ \
| * | | Merge pull request #9802 from newsline/fix-broken-action-missingRafael Mendonça França2013-03-203-1/+18
| * | | Remove bad changelog entry from AR [ci skip]Carlos Antonio da Silva2013-03-201-3/+0
| * | | Wrong exception is occured when raising no translatable exceptionkennyj2013-03-203-0/+16
| * | | Don't crash exception translation w/ nil result attribute.Steve Jorgensen2013-03-201-1/+1
* | | | Added changelog for 687e68dFred Wu2013-03-211-0/+6
* | | | Fixed assets loading performance in 3.2.13Fred Wu2013-03-202-1/+10
|/ / /
* | | Be consistent with quotes in smtp example guide [ci skip]Carlos Antonio da Silva2013-03-191-1/+1
* | | Merge pull request #9796 from dembskoi/clone_structureRafael Mendonça França2013-03-192-0/+8
|\ \ \
| * | | Reset postgreSQL search path in db:test:clone_structure.Alexander2013-03-192-0/+8
* | | | Merge pull request #9804 from samsonasu/backport_number_to_human_fixesRafael Mendonça França2013-03-193-1/+20
|\ \ \ \ | |/ / / |/| | |
| * | | Backport #9347 to rails 3.2hoffm2013-03-193-1/+20
|/ / /
* | | Merge pull request #9789 from puma/3-2-stableJosé Valim2013-03-181-1/+1
|\ \ \
| * | | 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