aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ci skip] Adding a note to Action Mailer Basics documentation that Google inc...melissawahnish2015-08-081-0/+3
* Merge pull request #21167 from AaronLasseigne/use_each_keyKasper Timm Hansen2015-08-082-2/+2
|\
| * replace each with each_key when only the key is neededAaron Lasseigne2015-08-082-2/+2
* | Refactor route assertion methods in resources testeileencodes2015-08-081-50/+51
* | Merge pull request #11352 from xaviershay/dispatcher-apiRafael Mendonça França2015-08-084-21/+23
|\ \
| * | Allow a custom dispatcher to be provided to routing.Xavier Shay2015-08-074-19/+17
| * | Move `controller_reference` and `controller_class_names` to protectedXavier Shay2015-08-071-2/+6
* | | Fix deprecation warning in testseileencodes2015-08-083-9/+9
* | | Rename `extra_keys` variables to `query_string_keys`eileencodes2015-08-082-4/+4
* | | Refactor to remove DrawOnce moduleeileencodes2015-08-081-27/+8
* | | Merge pull request #21170 from y-yagi/fix_uuid_exampleAbdelkader Boudih2015-08-081-1/+1
|\ \ \
| * | | use uuid method to define the UUID type [ci skip]yuuji.yaginuma2015-08-081-1/+1
|/ / /
* | | Merge pull request #21169 from yui-knk/doc/route_statusRichard Schneeman2015-08-071-1/+5
|\ \ \ | |/ / |/| |
| * | [ci skip] Add an explanation for `status` optionyui-knk2015-08-081-1/+5
|/ /
* | deprecate the env method on controller instancesAaron Patterson2015-08-073-2/+4
* | the request object manages `env`Aaron Patterson2015-08-071-2/+0
* | remove vestigial codeAaron Patterson2015-08-072-82/+0
* | stop using @_env in the controller instanceAaron Patterson2015-08-075-7/+14
* | finish deprecating handling strings and symbolsAaron Patterson2015-08-076-80/+24
* | Using strings or symbols for middleware class names is deprecated.Aaron Patterson2015-08-076-50/+61
* | move `valid?` conditional to the constructorAaron Patterson2015-08-071-11/+21
* | simplify the Middleware constructorAaron Patterson2015-08-073-57/+54
* | use Proc.new to reduce some conditionalsAaron Patterson2015-08-071-3/+1
* | the request class is never changed, so just use it directly in the method bodyAaron Patterson2015-08-072-6/+6
|/
* Merge pull request #21161 from rails/rm-xml-serializerRafael Mendonça França2015-08-0713-1204/+12
|\
| * Remove XML Serialization from core.Zachary Scott2015-08-0713-1204/+12
* | Regexp#=== is faster than String#=~schneems2015-08-071-1/+1
|/
* refactor param parsing middleware to use request objectsAaron Patterson2015-08-072-10/+17
* move flash hash access to methods on the request objectAaron Patterson2015-08-071-2/+11
* Merge pull request #20933 from siadat/relations-in-batches-using-idsDavid Heinemeier Hansson2015-08-076-12/+413
|\
| * Add ActiveRecord::Relation#in_batchesSina Siadat2015-08-076-12/+413
* | Merge pull request #21159 from tcopeland/fix_spelingKasper Timm Hansen2015-08-071-1/+1
|\ \
| * | Fix doc typoTom Copeland2015-08-071-1/+1
|/ /
* | Merge pull request #21158 from lsylvester/only-invoke-mattr_accessor-default-...Rafael Mendonça França2015-08-072-1/+7
|\ \ | |/ |/|
| * Only invoke the default block for mattr_accessor once so that it does not cau...Lachlan Sylvester2015-08-072-1/+7
|/
* Merge pull request #21156 from yui-knk/fix/guide_instumentationMatthew Draper2015-08-071-8/+0
|\
| * [ci skip] Remove `identity.active_record`yui-knk2015-08-071-8/+0
|/
* Merge pull request #21155 from AaronLasseigne/fewer_objectsRichard Schneeman2015-08-061-1/+1
|\
| * speed up code and avoid unnecessary MatchData objectsAaron Lasseigne2015-08-061-1/+1
* | Merge pull request #21153 from grosser/grosser/portsRafael Mendonça França2015-08-062-1/+24
|\ \
| * | do not add common ports to HTTP_HOSTMichael Grosser2015-08-062-1/+24
| |/
* | Merge pull request #20972 from vngrs/bin_updateRafael Mendonça França2015-08-063-1/+33
|\ \
| * | Added bin/update script to update application automaticallyMehmet Emin İNAÇ2015-08-073-1/+33
* | | Merge pull request #21154 from sobrinho/patch-1Rafael Mendonça França2015-08-061-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix documentation on ActionDispatch::RequestGabriel Sobrinho2015-08-061-1/+1
|/ /
* | use a request object to access info from env in GetIpAaron Patterson2015-08-062-11/+19
* | ask the request if we should show exceptionsAaron Patterson2015-08-063-4/+13
* | ExceptionWrapper doesn't need to know about `env`Aaron Patterson2015-08-064-26/+22
* | prevent string allocationsAaron Patterson2015-08-061-1/+1
* | Merge pull request #20459Sean Griffin2015-08-063-0/+132
|\ \ | |/ |/|