aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #11175 from robin850/patch-4Steve Klabnik2013-06-291-1/+1
|\ \ \ | |/ / |/| |
| * | Update a broken link into the fixtures' templateRobin Dupret2013-06-291-1/+1
|/ /
* | use bytesize rather than force encodingAaron Patterson2013-06-281-2/+1
* | writing the new body can cause the response to be committed and theAaron Patterson2013-06-281-1/+3
* | Merge pull request #11160 from wangjohn/documentation_for_railties_initializa...Vijay Dev2013-06-281-8/+21
|\ \
| * | Adding documentation to the Rails initialization guide. [ci skip]wangjohn2013-06-261-8/+21
|/ /
* | Merge pull request #11163 from nfedyashev/omit_turbolinks_on_javascript_skip_...Carlos Antonio da Silva2013-06-283-3/+17
|\ \
| * | Omit turbolinks configuration completely on skip_javascript generator optionNikita Fedyashev2013-06-283-3/+17
* | | Merge pull request #11161 from dmitry/find_in_batches_works_without_loggerCarlos Antonio da Silva2013-06-282-2/+12
|\ \ \
| * | | find_in_batches should work without loggerDmitry Polushkin2013-06-282-2/+12
* | | | Remove order_values argument now that default_scope is simplifiedCarlos Antonio da Silva2013-06-281-5/+5
* | | | Simplify/fix implementation of default scopesJon Leighton2013-06-2812-74/+31
* | | | Merge pull request #11104 from drewda/patch-1Carlos Antonio da Silva2013-06-281-0/+2
|\ \ \ \
| * | | | adding additional plugins for debugging [ci skip]Drew Dara-Abrams2013-06-271-0/+2
* | | | | Fix layouts and rendering guide example using flash.now insteadCarlos Antonio da Silva2013-06-281-1/+1
* | | | | Apply default scope when joining associations.Jon Leighton2013-06-283-0/+29
* | | | | Fix testJon Leighton2013-06-281-1/+8
* | | | | Fix rake test_sqlite3_memJon Leighton2013-06-282-11/+7
* | | | | Merge pull request #11153 from strzalek/remove-ar-deprecated-findersJon Leighton2013-06-287-637/+7
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove depreacted findersŁukasz Strzałkowski2013-06-287-637/+7
* | | | | Fix indentationAkira Matsuda2013-06-281-1/+1
| |_|_|/ |/| | |
* | | | Merge pull request #11150 from jetthoughts/remove_depr_message_for_attribute_...Carlos Antonio da Silva2013-06-272-19/+0
|\ \ \ \
| * | | | Remove deprecation warning from AttributeMethodsMatcherPaul Nikitochkin2013-06-282-19/+0
|/ / / /
* | | | Merge pull request #11127 from jetthoughts/ask_user_add_line_to_routes_in_guideYves Senn2013-06-271-2/+2
|\ \ \ \
| * | | | Asking user to declare post resource in guide [ci skip]Paul Nikitochkin2013-06-271-2/+2
|/ / / /
* | | | Merge pull request #11149 from strzalek/remove-protected-attrsCarlos Antonio da Silva2013-06-274-39/+0
|\ \ \ \
| * | | | Remove deprecated attr_protected/accessibleŁukasz Strzałkowski2013-06-274-39/+0
| |/ / /
* | | | Review AV changelog [ci skip]Carlos Antonio da Silva2013-06-271-2/+2
* | | | Merge pull request #11147 from kennyj/remove_prompt_argument_was_deprecatedCarlos Antonio da Silva2013-06-273-26/+7
|\ \ \ \
| * | | | Remove passing the prompt to grouped_options_for_select as an argument, becau...kennyj2013-06-283-26/+7
|/ / / /
* | | | Merge pull request #11141 from keydunov/masterYves Senn2013-06-271-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix documentation for grouped_collection_select [ci skip]Artyom2013-06-271-1/+1
* | | | Merge pull request #11146 from kennyj/re-remove-deprecated-apiRafael Mendonça França2013-06-272-19/+0
|\ \ \ \
| * | | | Re-remove deprecated API.kennyj2013-06-282-19/+0
* | | | | Merge pull request #11145 from JeffreyRodriguez/rails_4_root_directive_update...Rafael Mendonça França2013-06-271-5/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Removed "to:" from root directive and fixed typo ":to"Jeff Rodriguez2013-06-271-5/+5
* | | | | Merge pull request #11144 from kennyj/fix_copyright_yearGuillermo Iguaran2013-06-271-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix copyright year for actionview [ci skip]kennyj2013-06-281-1/+1
|/ / / /
* | | | Fix punctuation in config templatesAkira Matsuda2013-06-282-2/+2
* | | | Merge pull request #11142 from tumayun/use_master_branch_activesupportRafael Mendonça França2013-06-271-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | activerecord/examples/simple.rb use master branch activesupport gemtumayun2013-06-271-1/+1
|/ / /
* | | Merge pull request #11139 from prathamesh-sonpatki/grammarYves Senn2013-06-271-3/+3
|\ \ \
| * | | fix grammar, change 'an' to 'a' [ci skip]Prathamesh Sonpatki2013-06-271-3/+3
* | | | Merge pull request #11054 from senny/11048_make_default_value_explicitCarlos Antonio da Silva2013-06-271-4/+2
|\ \ \ \
| * | | | make default value for `:message` on `AM::Errors` explicit.Yves Senn2013-06-221-4/+2
* | | | | Merge pull request #11133 from wangjohn/remove_deprecation_rake_taskYves Senn2013-06-271-18/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Removing deprecation message and silencing method.wangjohn2013-06-261-18/+0
* | | | | Merge pull request #11136 from prathamesh-sonpatki/rails4Yves Senn2013-06-271-1/+1
|\ \ \ \ \
| * | | | | Use activerecord 4.0.0 for reporting bugs using the template[ci skip]Prathamesh Sonpatki2013-06-271-1/+1
| |/ / / /
* | | | | Merge pull request #11137 from WvanLelyveld/masterSteve Klabnik2013-06-271-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |