Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Revert "Replace (slower) block.call with (faster) yield" | Zachary Scott | 2014-10-18 | 5 | -11/+11 | |
* | | | | | Merge branch 'master' of github.com:rails/rails | Zachary Scott | 2014-10-18 | 0 | -0/+0 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge pull request #17034 from pramod-sharma/master | Zachary Scott | 2014-10-18 | 1 | -1/+15 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | [ci skip] Add Doc of with_options for the case when inherited default options... | Pramod Sharma | 2014-09-25 | 1 | -1/+15 | |
| * | | | | | Merge pull request #17302 from claudiob/replace-slower-block-call-with-faster... | Rafael Mendonça França | 2014-10-17 | 5 | -11/+11 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Replace (slower) block.call with (faster) yield | claudiob | 2014-10-17 | 5 | -11/+11 | |
* | | | | | | | [ci skip] Add a note about headers overwriting | Nicolas Cavigneaux | 2014-10-18 | 1 | -5/+21 | |
* | | | | | | | [ci skip] Add Doc of with_options for the case when inherited default options... | Pramod Sharma | 2014-10-18 | 1 | -1/+15 | |
* | | | | | | | Replace (slower) block.call with (faster) yield | claudiob | 2014-10-18 | 5 | -11/+11 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #17300 from claudiob/add-necessary-require-reverse-merge | Rafael Mendonça França | 2014-10-17 | 2 | -0/+11 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Add necessary 'require reverse_merge' to HAWI.rb | claudiob | 2014-10-17 | 2 | -0/+11 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #17296 from sgrif/sg-booleans-should-make-sense | Rafael Mendonça França | 2014-10-16 | 2 | -5/+14 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add a deprecation warning for abiguous boolean values | Sean Griffin | 2014-10-16 | 2 | -5/+14 | |
|/ / / / / | ||||||
* | | | | | Improve the warning a bit [ci skip] | Rafael Mendonça França | 2014-10-16 | 1 | -1/+1 | |
* | | | | | Merge pull request #15827 from yuki24/another-improvements-for-dynamic-error-... | Rafael Mendonça França | 2014-10-16 | 1 | -1/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | A warning line should look like a warning section | Yuki Nishijima | 2014-06-19 | 1 | -1/+3 | |
* | | | | | | Merge pull request #17293 from djpowers/patch-1 | Rafael Mendonça França | 2014-10-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Clarify wording in Rails HTML Sanitizer section | Dave Powers | 2014-10-16 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #17292 from tricknotes/generator-test-doc | Rafael Mendonça França | 2014-10-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix example code for `Rails::Generators::Testing::Behaviour` [ci skip] | Ryunosuke SATO | 2014-10-17 | 1 | -1/+1 | |
* | | | | | | | Use released rails-dom-testing | Rafael Mendonça França | 2014-10-16 | 5 | -7/+3 | |
|/ / / / / / | ||||||
* | | | | | | test, `Generators::GeneratedAttribute` with references, required, index. | Yves Senn | 2014-10-16 | 1 | -0/+8 | |
* | | | | | | Merge pull request #17285 from dwo/master | Yves Senn | 2014-10-16 | 1 | -0/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | mention the :without option [ci skip] | Rob | 2014-10-16 | 1 | -0/+2 | |
* | | | | | | | Merge pull request #17278 from velobuff/clarify-debugger-invocation | Yves Senn | 2014-10-16 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | clarify debugger platform invocation | Raman Sinha | 2014-10-15 | 1 | -1/+2 | |
* | | | | | | | test, better describe `SerializationTypeMismatch` behavior. refs #14716. | Yves Senn | 2014-10-16 | 2 | -4/+3 | |
* | | | | | | | pg, test assigning non-array values to an array column. Closes #14716. | Yves Senn | 2014-10-16 | 1 | -0/+9 | |
* | | | | | | | Merge pull request #17281 from y-yagi/configuring_guide | Zachary Scott | 2014-10-16 | 1 | -14/+15 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [ci skip] add AC::InvalidCrossOriginRequest to list of rescue_responses default | yuuji.yaginuma | 2014-10-16 | 1 | -14/+15 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | docs, since #16702 we detect mutation on serialized attributes. [ci skip] | Yves Senn | 2014-10-16 | 1 | -3/+0 | |
* | | | | | | | some changelog formatting. [ci skip] | Yves Senn | 2014-10-16 | 4 | -12/+12 | |
* | | | | | | | Merge pull request #17280 from aditya-kapoor/remove-unneeded-file | Yves Senn | 2014-10-16 | 1 | -9/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | remove unneeded file | Aditya Kapoor | 2014-10-16 | 1 | -9/+0 | |
* | | | | | | | | Merge pull request #17279 from aditya-kapoor/call-methods | Yves Senn | 2014-10-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | use require_command! instead of calling its definition | Aditya Kapoor | 2014-10-16 | 1 | -1/+1 | |
| |/ / / / / / | ||||||
* | | | | | | | we don't need a HWIA and a hash allocated for just one k/v pair | Aaron Patterson | 2014-10-15 | 1 | -5/+3 | |
* | | | | | | | just look up the primary key from the columns hash | Aaron Patterson | 2014-10-15 | 1 | -6/+1 | |
* | | | | | | | add table.bigint support | Aaron Patterson | 2014-10-15 | 3 | -1/+21 | |
| |_|_|_|/ / |/| | | | | | ||||||
* | | | | | | Merge pull request #17277 from yuutetu/fix_type_in_routing_mapper | Guillermo Iguaran | 2014-10-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix typo in actionpack/lib/action_dispatch/routing/mapper.rb | Yuutetu | 2014-10-16 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Use if/else instead of early raise | Rafael Mendonça França | 2014-10-15 | 1 | -2/+5 | |
* | | | | | | Merge pull request #17267 from rebyn/master | Rafael Mendonça França | 2014-10-15 | 4 | -0/+16 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Raise an error for has_one associations which try to go :through a polymorphi... | Tu Hoang | 2014-10-15 | 4 | -0/+16 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #17255 from printercu/cors_exception_wrapper | Rafael Mendonça França | 2014-10-15 | 1 | -10/+11 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | ActionController::InvalidCrossOriginRequest fails with 422 instead of 500 | Max Melentiev | 2014-10-14 | 1 | -10/+11 | |
* | | | | | | | Merge pull request #17273 from claudiob/fix-file-and-password-field-tag | Rafael Mendonça França | 2014-10-15 | 2 | -2/+9 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix how file_ and password_field_tag edit options | claudiob | 2014-10-15 | 2 | -2/+9 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #17262 from swapdisc/delete-join-operation-struct | Rafael Mendonça França | 2014-10-15 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | delete leftover JoinOperation struct | swapdisc | 2014-10-14 | 1 | -2/+0 | |
| | |/ / / / / | |/| | | | | |