aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add fixed fileDermot Haughey2015-05-272-16/+66
| | | | | | add framework_test add another test
* Merge pull request #20316 from ↵Rafael Mendonça França2015-05-271-0/+1
|\ | | | | | | | | vngrs/add_assertion_for_get_method_into_request_test Add assertion for get? method into test cases
| * Add assertion for get? method into test casesMehmet Emin İNAÇ2015-05-271-0/+1
| |
* | Merge pull request #20321 from vngrs/fix_indentation_warningRafael Mendonça França2015-05-271-1/+1
|\ \ | | | | | | Fix indentation warning on active_support ordered_options
| * | Fix indentation warning on active_support ordered_optionsMehmet Emin İNAÇ2015-05-271-1/+1
| | |
* | | Merge pull request #20323 from jakegavin/initialization-guide-updateClaudio B.2015-05-271-3/+2
|\ \ \ | | | | | | | | Remove unnecessary reference to example Blog app in initialization guides
| * | | Remove unnecessary reference to example Blog app [ci skip]Jake Gavin2015-05-271-3/+2
|/ / /
* | | Merge pull request #20319 from kassio/masterRafael Mendonça França2015-05-271-2/+4
|\ \ \ | |/ / |/| | Remove web-console and spring from test group on default Gemfile.
| * | Remove web-console and spring from test group on default Gemfile.Kassio Borges2015-05-271-2/+4
|/ /
* | Merge pull request #20314 from vngrs/add_doc_about_form_data_methodSantiago Pastorino2015-05-271-0/+2
|\ \ | |/ |/| Documentation for ActionDispatch::Request form_data? method [ci skip]
| * Documentation for ActionDispatch::Request form_data? method [ci skip]Mehmet Emin İNAÇ2015-05-271-0/+2
|/
* Merge pull request #20262 from arunagw/aa-remove-broken-unused-release-taskYves Senn2015-05-278-60/+0
|\ | | | | Remove broken and unused release task
| * Remove broken and unused release taskArun Agrawal2015-05-228-60/+0
| | | | | | | | | | - We do release with release.rb - There is no `rake/gemcutter`
* | Merge pull request #20297 from gouravtiwari/patch-9Claudio B.2015-05-261-0/+6
|\ \ | | | | | | Added multibyte slice! example to doc [ci skip]
| * | Added multibyte slice! example to doc [ci skip]Gourav Tiwari2015-05-261-0/+6
| | |
* | | Merge pull request #20310 from guigs/patch-1Rafael Mendonça França2015-05-261-1/+1
|\ \ \ | | | | | | | | Fix email with name format in Guides. [ci skip]
| * | | Fix email with name format in Guides. [ci skip]Guilherme Goettems Schneider2015-05-261-1/+1
|/ / /
* | | Merge pull request #20208 from gaurish/raise_on_missing_ordered_optionsRafael Mendonça França2015-05-263-1/+39
|\ \ \ | | | | | | | | | | | | Add bang version to OrderedOptions
| * | | Add bang version to OrderedOptionsGaurish Sharma2015-05-233-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | By: Aditya Sanghi(@asanghi) Gaurish Sharma(gaurish)
* | | | Merge pull request #20305 from ↵Rafael Mendonça França2015-05-261-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | vngrs/missing_docs_and_no_docs_for_action_dispatch_request Add missing nodocs and docs for ActionDispatch::Request [ci skip]
| * | | | Add missing nodocs and docs for ActionDispatch::Request [ci skip]Mehmet Emin İNAÇ2015-05-261-3/+5
| | | | | | | | | | | | | | | | | | | | add missing dot to end of the doc
* | | | | Merge pull request #20309 from stephen-puiszis/patch-1Rafael Mendonça França2015-05-261-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Add info on default layout functionality 3.2 >> 4.0 upgrade
| * | | | | Add info on default layout functionality 3.2 >> 4.0 upgradeStephen Puiszis2015-05-261-0/+2
|/ / / / /
* | | | | Merge pull request #20027 from keepcosmos/add-extend-option-on-habtmYves Senn2015-05-263-1/+20
|\ \ \ \ \ | |/ / / / |/| | | | Add `extend` option on `has_and_belongs_to_many`.
| * | | | add `extend` option on `has_and_belongs_to_many`.keepcosmos2015-05-263-1/+20
|/ / / /
* | | | Merge pull request #20303 from vngrs/remove_redundant_like_from_slice_docYves Senn2015-05-261-1/+1
|\ \ \ \ | | | | | | | | | | Remove redundant 'like' from doc of slice! method [ci skip]
| * | | | Remove redundant 'like' from doc of slice! method [ci skip]Mehmet Emin İNAÇ2015-05-261-1/+1
| | | | |
* | | | | Merge pull request #20304 from arunagw/aa-remove-unused-variableYves Senn2015-05-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove unused variable
| * | | | | Remove unused variableArun Agrawal2015-05-261-1/+1
|/ / / / / | | | | | | | | | | | | | | | Was left in adfab2dcf4003ca564d78d4425566dd2d9cd8b4f
* / / / / deprecate `Relation#uniq` use `Relation#distinct` instead.Yves Senn2015-05-2612-31/+52
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #9683 for the reasons we switched to `distinct`. Here is the discussion that triggered the actual deprecation #20198. `uniq`, `uniq!` and `uniq_value` are still around. They will be removed in the next minor release after Rails 5.
* | | | Merge pull request #16938 from akshay-vishnoi/remove-depricationYves Senn2015-05-265-169/+5
|\ \ \ \ | |_|/ / |/| | | | | | | Remove `.superclass_delegating_accessor`.
| * | | Remove `.superclass_delegating_accessor`. Refer #14271Akshay Vishnoi2015-05-245-169/+4
| | | |
* | | | Merge pull request #20296 from vngrs/use_memoization_to_minimize_memory_usageMatthew Draper2015-05-261-1/+1
|\ \ \ \ | | | | | | | | | | Use memoization while accessing request headers for minimizing memory usage
| * | | | Use memoization while accessing request headers for minimizing memory usageMehmet Emin İNAÇ2015-05-251-1/+1
|/ / / /
* | | | Merge pull request #20295 from rohandaxini/patch-1Abdelkader Boudih2015-05-251-1/+1
|\ \ \ \ | | | | | | | | | | Fixed the grammatical mistake in the sentence [ci skip]
| * | | | Fixed the grammatical mistake in the sentence [ci skip]Rohan Daxini2015-05-251-1/+1
|/ / / /
* | | | Merge pull request #20248 from ronakjangir47/remove_mochaRafael Mendonça França2015-05-251-18/+34
|\ \ \ \ | | | | | | | | | | Remove use of mocha in the railties generators tests
| * | | | Remove use of mocha in the railties generators tests Ronak Jangir2015-05-221-18/+34
| | | | |
* | | | | Merge pull request #20294 from yoongkang/american_spellingRafael Mendonça França2015-05-251-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix spelling mistakes
| * | | | | Fix spelling mistakesYoong Kang Lim2015-05-251-4/+4
| | | | | |
* | | | | | Merge pull request #20293 from davydovanton/doc-durationKasper Timm Hansen2015-05-251-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Update documentation for Duration#to_s
| * | | | | [skip ci] Update documentation for Duration#to_sAnton Davydov2015-05-251-0/+4
|/ / / / /
* | | | | Merge branch 'master' of github.com:rails/railsZachary Scott2015-05-242-2/+14
|\ \ \ \ \
| * \ \ \ \ Merge pull request #20288 from brian-davis/brian-davisZachary Scott2015-05-241-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Grammar fix to Active Record Basics guide. [ci skip]
| | * | | | | Grammar fix to Active Record Basics guide. [ci skip]Brian Davis2015-05-241-2/+2
| |/ / / / /
| * | | | | Merge pull request #20286 from davydovanton/doc-deprecation-behaviorAbdelkader Boudih2015-05-251-0/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | Add documentation for Deprecation::Behavior module
| | * | | | | [skip ci] Add documentation for Deprecation::Behavior moduleAnton Davydov2015-05-251-0/+12
| | |/ / / /
* | / / / / Add missing type reference hereZachary Scott2015-05-241-1/+1
|/ / / / /
* | | | | s/contstant/constant re #20282 [ci skip]Zachary Scott2015-05-241-2/+2
| | | | |
* | | | | Merge pull request #20282 from davydovanton/doc-proxy-wrappersZachary Scott2015-05-241-0/+5
|\ \ \ \ \ | | | | | | | | | | | | Add documentation for DeprecatedConstantProxy#class