aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #12232 from claudiob/delete-unused-helper-fixturesSantiago Pastorino2013-09-204-16/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused AV helper fixtures from e10a2531claudiob2013-09-144-16/+0
* | | | | | | | | Merge pull request #12301 from Gazler/guide_3_0_release_notes_broken_linkRafael Mendonça França2013-09-201-2/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix: Remove broken link on rails 3 guideGary Rennie2013-09-201-2/+0
* | | | | | | | | | Merge pull request #11452 from dasch/dasch/details-in-digestor-cache-keyJosé Valim2013-09-203-2/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bust the template digest cache key when details are changedDaniel Schierbeck2013-09-193-2/+39
* | | | | | | | | | | Merge pull request #12285 from dasch/dasch/allow-attaching-up-frontJosé Valim2013-09-203-2/+92
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Allow attaching to AS::Notifications namespace up frontDaniel Schierbeck2013-09-203-2/+92
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #12299 from hitendrasingh/code_refactorJosé Valim2013-09-203-8/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Initializing Codepoint object with default valuesHitendra Singh2013-09-202-6/+7
| * | | | | | | | | | Drying up method_missing codeHitendra Singh2013-09-201-2/+1
* | | | | | | | | | | mention controller test base class in testing guide. [ci skip]Yves Senn2013-09-201-4/+6
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #12295 from gaurish/patch-2Guillermo Iguaran2013-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow failures in jruby-headGaurish Sharma2013-09-201-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #12294 from gaurish/patch-1Guillermo Iguaran2013-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Run Tests against JRuby masterGaurish Sharma2013-09-201-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #10362 from derekprior/dp-fix-assert-redirect-toAndrew White2013-09-194-34/+53
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix regex used to find URI schemes in redirect_toDerek Prior2013-09-192-1/+6
| * | | | | | | | | | Fix incorrect assert_redirected_to failure messageDerek Prior2013-09-194-34/+48
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #12280 from kennyj/remove_1_8_compatJosé Valim2013-09-191-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove 1.8 compatible codekennyj2013-09-191-1/+1
* | | | | | | | | | Merge pull request #12279 from jbaudanza/reset_sessionJosé Valim2013-09-182-0/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | NullSessionHash#destroy should be a no-opJonathan Baudanza2013-09-182-0/+13
|/ / / / / / / / /
* | | | | | | | | remove unused variableAaron Patterson2013-09-181-1/+0
* | | | | | | | | support objects with blank string primary keysAaron Patterson2013-09-182-1/+7
* | | | | | | | | ActiveRecord::Base#<=> has been removed. Primary keys may not be in order,Aaron Patterson2013-09-183-16/+10
* | | | | | | | | do what the superclass does in the case that objects do not matchAaron Patterson2013-09-182-0/+10
* | | | | | | | | Merge pull request #12276 from kennyj/fix_12269Rafael Mendonça França2013-09-183-0/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix an issue where router can't recognize downcased url encoding path.kennyj2013-09-193-0/+11
|/ / / / / / / / /
* | | | | | | | | There's no need to do thisSantiago Pastorino2013-09-171-4/+1
* | | | | | | | | Merge pull request #12262 from sferik/remove_tzinfo_from_actionpackRafael Mendonça França2013-09-171-5/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove tzinfo dependency from Action PackErik Michaels-Ober2013-09-171-5/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #12250 from JuanitoFatas/migrationRafael Mendonça França2013-09-161-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] Improve readability of 4.3's NOTE in migration.md.Juanito Fatas2013-09-171-3/+3
* | | | | | | | | | Merge pull request #12011 from jetthoughts/11963_fix_join_with_association_scopeRafael Mendonça França2013-09-164-6/+25
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Collapse where constraints to one where constraintPaul Nikitochkin2013-09-134-6/+25
* | | | | | | | | | Merge pull request #12245 from kennyj/remove_no_using_code_20130916José Valim2013-09-161-4/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removes unused code related to DatabaseTasks.kennyj2013-09-161-4/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #12239 from JuanitoFatas/form_helpersSteve Klabnik2013-09-151-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ci skip] Consistency wording of 9.6 in form_helpers.mdJuanito Fatas2013-09-151-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #12231 from harshadsabne/masterSteve Klabnik2013-09-141-6/+6
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | [ci skip] Update plugins.mdHarshad Sabne2013-09-141-6/+6
* | | | | | | | | | Merge pull request #12225 from adomokos/no_need_for_active_support_concernSteve Klabnik2013-09-131-2/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removing ActiveSupport::Concern, it's not neededAttila Domokos2013-09-131-2/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #12223 from adomokos/fixing_typoRafael Mendonça França2013-09-131-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixing comment typo in ActionController::BaseAttila Domokos2013-09-131-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Don't require using application_name before optionsPiotr Sarnacki2013-09-135-23/+23
* | | | | | | | | | Merge pull request #12222 from rcillo/fix-custom-flashRafael Mendonça França2013-09-133-1/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Custom flash should be defined only for the class that defines it and it's su...Ricardo de Cillo2013-09-133-1/+20
* | | | | | | | | | | Merge pull request #12215 from harshadsabne/masterRafael Mendonça França2013-09-131-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |