aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #20326 from hderms/dh/fix_task_bugRafael Mendonça França2015-05-272-16/+66
|\ \ \ \ \ \ \ \
| * | | | | | | | add fixed fileDermot Haughey2015-05-272-16/+66
* | | | | | | | | :bomb: Fix another leftoverRafael Mendonça França2015-05-271-1/+1
* | | | | | | | | Fix file nameRafael Mendonça França2015-05-271-1/+1
* | | | | | | | | Merge pull request #19808 from byroot/action-parameterRafael Mendonça França2015-05-272-15/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow to parameters named `action` or `controller` from AC::TestCase helpersJean Boussier2015-04-182-15/+32
* | | | | | | | | | Merge pull request #19867 from radar/rename-app-rails-loaderRafael Mendonça França2015-05-274-14/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove redundant 'Rails' from Rails::AppRailsLoader constantRyan Bigg2015-05-214-14/+14
* | | | | | | | | | | Merge pull request #20327 from yoongkang/ajaxZachary Scott2015-05-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | [ci skip] Replace dead link about HttpOnly cookies.Yoong Kang Lim2015-05-281-1/+1
* | | | | | | | | | | Merge pull request #20316 from vngrs/add_assertion_for_get_method_into_reques...Rafael Mendonça França2015-05-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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_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 [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.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]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 taskArun Agrawal2015-05-228-60/+0
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #20297 from gouravtiwari/patch-9Claudio B.2015-05-261-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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]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 OrderedOptionsGaurish Sharma2015-05-233-1/+36
* | | | | | | | | | | | Merge pull request #20305 from vngrs/missing_docs_and_no_docs_for_action_disp...Rafael Mendonça França2015-05-261-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add missing nodocs and docs for ActionDispatch::Request [ci skip]Mehmet Emin İNAÇ2015-05-261-3/+5
* | | | | | | | | | | | 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 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`.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]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 variableArun Agrawal2015-05-261-1/+1
|/ / / / / / / / / / / /
* / / / / / / / / / / / deprecate `Relation#uniq` use `Relation#distinct` instead.Yves Senn2015-05-2612-31/+52
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #16938 from akshay-vishnoi/remove-depricationYves Senn2015-05-265-169/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | 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 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]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 Ronak Jangir2015-05-221-18/+34
* | | | | | | | | | | | Merge pull request #20294 from yoongkang/american_spellingRafael Mendonça França2015-05-251-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix spelling mistakesYoong Kang Lim2015-05-251-4/+4
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #20293 from davydovanton/doc-durationKasper Timm Hansen2015-05-251-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |