Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge branch 'justanshulsharma-activerecord-merge-docs' | Zachary Scott | 2014-10-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'activerecord-merge-docs' of https://github.com/justanshulsharma... | Zachary Scott | 2014-10-19 | 1 | -1/+1 | |
|/| | | | | | | | | | ||||||
| * | | | | | | | | | [ci skip] Make merge method nodoc | Anshul Sharma | 2014-10-20 | 1 | -8/+1 | |
| * | | | | | | | | | [ci skip] merge docs | Anshul Sharma | 2014-10-20 | 1 | -0/+7 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #17323 from seuros/master | Rafael Mendonça França | 2014-10-19 | 2 | -4/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | remove duplicate method (_status_code) in action_dispatch | Abdelkader Boudih | 2014-10-19 | 2 | -4/+1 | |
* | | | | | | | | | Merge pull request #17322 from vipulnsward/fix-test-warning | Matthew Draper | 2014-10-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fixed test throwing unused variable warning | Vipul A M | 2014-10-19 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #17321 from prathamesh-sonpatki/nodoc-status_at | Abdelkader Boudih | 2014-10-19 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Make _status_code methods nodoc | Prathamesh Sonpatki | 2014-10-19 | 2 | -4/+4 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #17319 from igas/fix-17318 | Matthew Draper | 2014-10-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | fix wrong #17318 [ci skip] | Igor Kapkov | 2014-10-19 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #17318 from igas/guides-more-friendly-for-nonlatin | Abdelkader Boudih | 2014-10-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | make guides example more friendly to nonlatin langs | Igor Kapkov | 2014-10-19 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | :nail_care: it's -> its (see comments on 9a586ac) | Godfrey Chan | 2014-10-18 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #17314 from y-yagi/message_delivery_doc | Zachary Scott | 2014-10-18 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | [ci skip] add :queue option to deliver_later and deliver_later! documentation | yuuji.yaginuma | 2014-10-19 | 1 | -0/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | [ci skip] A Rails engine is not a man :ok_woman: | Zachary Scott | 2014-10-18 | 1 | -1/+1 | |
* | | | | | | | | [ci skip] Fix word wrap, capitalization, and spacing of text from #17284 | Zachary Scott | 2014-10-18 | 1 | -4/+5 | |
* | | | | | | | | Merge pull request #17302 from claudiob/replace-slower-block-call-with-faster... | Rafael Mendonça França | 2014-10-18 | 5 | -11/+11 | |
* | | | | | | | | 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 | |
| | |_|_|_|_|/ / / / | |/| | | | | | | | |