aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Revert "Replace (slower) block.call with (faster) yield"Zachary Scott2014-10-185-11/+11
* | | | | Merge branch 'master' of github.com:rails/railsZachary Scott2014-10-180-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge pull request #17034 from pramod-sharma/masterZachary Scott2014-10-181-1/+15
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [ci skip] Add Doc of with_options for the case when inherited default options...Pramod Sharma2014-09-251-1/+15
| * | | | | Merge pull request #17302 from claudiob/replace-slower-block-call-with-faster...Rafael Mendonça França2014-10-175-11/+11
| |\ \ \ \ \
| | * | | | | Replace (slower) block.call with (faster) yieldclaudiob2014-10-175-11/+11
* | | | | | | [ci skip] Add a note about headers overwritingNicolas Cavigneaux2014-10-181-5/+21
* | | | | | | [ci skip] Add Doc of with_options for the case when inherited default options...Pramod Sharma2014-10-181-1/+15
* | | | | | | Replace (slower) block.call with (faster) yieldclaudiob2014-10-185-11/+11
|/ / / / / /
* | | | | | Merge pull request #17300 from claudiob/add-necessary-require-reverse-mergeRafael Mendonça França2014-10-172-0/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add necessary 'require reverse_merge' to HAWI.rbclaudiob2014-10-172-0/+11
|/ / / / /
* | | | | Merge pull request #17296 from sgrif/sg-booleans-should-make-senseRafael Mendonça França2014-10-162-5/+14
|\ \ \ \ \
| * | | | | Add a deprecation warning for abiguous boolean valuesSean Griffin2014-10-162-5/+14
|/ / / / /
* | | | | Improve the warning a bit [ci skip]Rafael Mendonça França2014-10-161-1/+1
* | | | | Merge pull request #15827 from yuki24/another-improvements-for-dynamic-error-...Rafael Mendonça França2014-10-161-1/+3
|\ \ \ \ \
| * | | | | A warning line should look like a warning sectionYuki Nishijima2014-06-191-1/+3
* | | | | | Merge pull request #17293 from djpowers/patch-1Rafael Mendonça França2014-10-161-1/+1
|\ \ \ \ \ \
| * | | | | | Clarify wording in Rails HTML Sanitizer sectionDave Powers2014-10-161-1/+1
|/ / / / / /
* | | | | | Merge pull request #17292 from tricknotes/generator-test-docRafael Mendonça França2014-10-161-1/+1
|\ \ \ \ \ \
| * | | | | | Fix example code for `Rails::Generators::Testing::Behaviour` [ci skip]Ryunosuke SATO2014-10-171-1/+1
* | | | | | | Use released rails-dom-testingRafael Mendonça França2014-10-165-7/+3
|/ / / / / /
* | | | | | test, `Generators::GeneratedAttribute` with references, required, index.Yves Senn2014-10-161-0/+8
* | | | | | Merge pull request #17285 from dwo/masterYves Senn2014-10-161-0/+2
|\ \ \ \ \ \
| * | | | | | mention the :without option [ci skip]Rob2014-10-161-0/+2
* | | | | | | Merge pull request #17278 from velobuff/clarify-debugger-invocationYves Senn2014-10-161-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | clarify debugger platform invocationRaman Sinha2014-10-151-1/+2
* | | | | | | test, better describe `SerializationTypeMismatch` behavior. refs #14716.Yves Senn2014-10-162-4/+3
* | | | | | | pg, test assigning non-array values to an array column. Closes #14716.Yves Senn2014-10-161-0/+9
* | | | | | | Merge pull request #17281 from y-yagi/configuring_guideZachary Scott2014-10-161-14/+15
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] add AC::InvalidCrossOriginRequest to list of rescue_responses defaultyuuji.yaginuma2014-10-161-14/+15
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | docs, since #16702 we detect mutation on serialized attributes. [ci skip]Yves Senn2014-10-161-3/+0
* | | | | | | some changelog formatting. [ci skip]Yves Senn2014-10-164-12/+12
* | | | | | | Merge pull request #17280 from aditya-kapoor/remove-unneeded-fileYves Senn2014-10-161-9/+0
|\ \ \ \ \ \ \
| * | | | | | | remove unneeded fileAditya Kapoor2014-10-161-9/+0
* | | | | | | | Merge pull request #17279 from aditya-kapoor/call-methodsYves Senn2014-10-161-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | use require_command! instead of calling its definitionAditya Kapoor2014-10-161-1/+1
| |/ / / / / /
* | | | | | | we don't need a HWIA and a hash allocated for just one k/v pairAaron Patterson2014-10-151-5/+3
* | | | | | | just look up the primary key from the columns hashAaron Patterson2014-10-151-6/+1
* | | | | | | add table.bigint supportAaron Patterson2014-10-153-1/+21
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #17277 from yuutetu/fix_type_in_routing_mapperGuillermo Iguaran2014-10-151-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typo in actionpack/lib/action_dispatch/routing/mapper.rbYuutetu2014-10-161-1/+1
|/ / / / / /
* | | | | | Use if/else instead of early raiseRafael Mendonça França2014-10-151-2/+5
* | | | | | Merge pull request #17267 from rebyn/masterRafael Mendonça França2014-10-154-0/+16
|\ \ \ \ \ \
| * | | | | | Raise an error for has_one associations which try to go :through a polymorphi...Tu Hoang2014-10-154-0/+16
| |/ / / / /
* | | | | | Merge pull request #17255 from printercu/cors_exception_wrapperRafael Mendonça França2014-10-151-10/+11
|\ \ \ \ \ \
| * | | | | | ActionController::InvalidCrossOriginRequest fails with 422 instead of 500Max Melentiev2014-10-141-10/+11
* | | | | | | Merge pull request #17273 from claudiob/fix-file-and-password-field-tagRafael Mendonça França2014-10-152-2/+9
|\ \ \ \ \ \ \
| * | | | | | | Fix how file_ and password_field_tag edit optionsclaudiob2014-10-152-2/+9
|/ / / / / / /
* | | | | | | Merge pull request #17262 from swapdisc/delete-join-operation-structRafael Mendonça França2014-10-151-2/+0
|\ \ \ \ \ \ \
| * | | | | | | delete leftover JoinOperation structswapdisc2014-10-141-2/+0
| | |/ / / / / | |/| | | | |