aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ | | |/ / | |/| |
| * | | Update 3_2_release_notes.mdHarshad Sabne2013-09-131-5/+5
* | | | Merge pull request #12216 from suginoy/a-anRafael Mendonça França2013-09-139-11/+11
|\ \ \ \
| * | | | Fix typos: the indefinite articles(a -> an)SUGINO Yasuhiro2013-09-139-11/+11
* | | | | Missing destroy commandAkira Matsuda & Yukiko Kawamoto2013-09-131-0/+4
| |_|/ / |/| | |
* | | | Merge pull request #12129 from Empact/deprecate-array-bang-delegationRafael Mendonça França2013-09-125-147/+265
|\ \ \ \
| * | | | Deprecate the delegation of Array bang methods in ActiveRecord::DelegationBen Woosley2013-09-043-3/+117
| * | | | Pull the RelationMutationTests from cases/relation_test to cases/relation/mut...Ben Woosley2013-09-032-135/+139
| |/ / /
* | | | Merge pull request #12137 from lann/fix_association_first_lastRafael Mendonça França2013-09-123-6/+11
|\ \ \ \
| * | | | Make CollectionAssociation first/last with integer fetch with queryLann Martin2013-09-093-6/+11
* | | | | Add CHANGELOG entry for #11698Rafael Mendonça França2013-09-121-0/+4
* | | | | Merge pull request #11698 from dmathieu/sqlite_tasks_without_railsRafael Mendonça França2013-09-123-2/+4
|\ \ \ \ \
| * | | | | let the sqlite task run without railsDamien Mathieu2013-08-073-2/+4
* | | | | | Merge pull request #12156 from rywall/from-copy-bindsRafael Mendonça França2013-09-123-0/+12
|\ \ \ \ \ \
| * | | | | | Allow Relation#from to accept other relations with bind values.Ryan Wallace2013-09-083-0/+12
* | | | | | | Add CHANGELOG entry for #12149Rafael Mendonça França2013-09-121-0/+6
* | | | | | | Merge pull request #12159 from nashby/issue-12149Rafael Mendonça França2013-09-122-1/+10
|\ \ \ \ \ \ \
| * | | | | | | do not break params filtering on nil valuesVasiliy Ermolovich2013-09-072-1/+10
* | | | | | | | Use the Rails binary when generating taskRafael Mendonça França2013-09-121-2/+2
* | | | | | | | Merge pull request #12170 from siong1987/taskRafael Mendonça França2013-09-121-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] Documentation on how to create custom rake tasks.Teng Siong Ong2013-09-101-1/+3
* | | | | | | | | Merge pull request #12210 from vipulnsward/remove_extra_loopRafael Mendonça França2013-09-121-5/+2
|\ \ \ \ \ \ \ \ \