aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #11141 from keydunov/masterYves Senn2013-06-271-1/+1
|\ \ \ \ | |/ / / |/| | | Fix documentation for grouped_collection_select
| * | | 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.
| * | | | Re-remove deprecated API.kennyj2013-06-282-19/+0
| | | | |
* | | | | Merge pull request #11145 from ↵Rafael Mendonça França2013-06-271-5/+5
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | JeffreyRodriguez/rails_4_root_directive_updates_and_fixes Removed "to:" from root directive and fixed typo ":to"
| * | | | Removed "to:" from root directive and fixed typo ":to"Jeff Rodriguez2013-06-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | `root :to` is invalid syntax `root to:` is valid, but the generated routes file omits `to:`
* | | | | Merge pull request #11144 from kennyj/fix_copyright_yearGuillermo Iguaran2013-06-271-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix copyright year for actionview [ci skip]
| * | | | 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 gem
| * | | 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]
| * | | 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.
| * | | | 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.
| * | | | Removing deprecation message and silencing method.wangjohn2013-06-261-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The deprecation rake task is no longer useful because the deprecated methods have already been removed. The method for silencing stderr has been removed since it was only useful for `rake test:uncommitted` which was deprecated and removed.
* | | | | Merge pull request #11136 from prathamesh-sonpatki/rails4Yves Senn2013-06-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use activerecord 4.0.0 for reporting bugs using the template
| * | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | | There was a parenthesis in the guides, which resulted in the one link not working, and a second link not even showing. [ci skip]
| * | | | Fixing links to accept_language plugin/middlewareWouter van Lelyveld2013-06-271-1/+1
|/ / / /
* | | | Review railties changelog [ci skip]Carlos Antonio da Silva2013-06-261-5/+4
| | | |
* | | | Move delegation error constant to inside ModuleCarlos Antonio da Silva2013-06-262-3/+5
| | | |
* | | | Merge pull request #11124 from wangjohn/removing_deprecated_rake_tasksSantiago Pastorino2013-06-263-101/+6
|\ \ \ \ | | | | | | | | | | Removing deprecated rake tasks for tests
| * | | | Removing deprecated rake tasks.wangjohn2013-06-243-101/+6
| | | | | | | | | | | | | | | | | | | | | | | | | The `rake test:recent` and `rake test:uncommitted` tasks were deprecated and are now being removed.
* | | | | Merge pull request #11128 from edg3r/patch-1Yves Senn2013-06-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | linking small rails 4 features image to a bigger one
| * | | | | linking small rails 4 features image to a bigger one [ci skip]R4K32013-06-271-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | View a bigger version onclick https://github.com/rails/rails/issues/11100
* | | | | Merge pull request #10828 from southpolesteve/delegation_error_classYves Senn2013-06-262-2/+4
|\ \ \ \ \ | | | | | | | | | | | | Create DelegationError class
| * | | | | Add DelegationError class. Rasied by delegation to a nil objectSteve Faulkner2013-06-262-2/+4
| | | | | |
* | | | | | mention the removal of `--builder` in 4.0 release notes.Yves Senn2013-06-261-0/+4
| |/ / / / |/| | | |
* | | | | Merge pull request #11126 from ↵Rafael Mendonça França2013-06-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | tumayun/fix_activerecord_examples_performance_rb_syntax_error fix activerecord/examples/performance.rb#L101 syntax error
| * | | | | fix activerecord/examples/performance.rb#L101 syntax errortumayun2013-06-271-1/+1
| | | | | |
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-06-2616-37/+69
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Conflicts: guides/source/layout.html.erb
| * | | | | Remove a comment related to 920753fRobin Dupret2013-06-261-1/+0
| | | | | | | | | | | | | | | | | | Since 920753f, double assignment isn't used anymore
| * | | | | Mention Content-Type for JSON params parsing.Gustavo Delfino2013-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/8501021/rails-json-request-is-not-parsed-correctly-into-post-parameters
| * | | | | Added markdown tag for highlightAnton Cherepanov2013-06-241-1/+1
| | | | | |
| * | | | | [doc] Info added for tmp:create [ci skip]Rashmi Yadav2013-06-231-1/+2
| | | | | |
| * | | | | Missing mention about a generated file [ci skip]Robin Dupret2013-06-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add a mention about the helper's test file generated invoking the controller generator in the USAGE file
| * | | | | [doc] Update return false if record is invalidRashmi Yadav2013-06-191-2/+2
| | | | | |
| * | | | | rewrote render tag using more succinct and idiomatic wayChandresh Pant2013-06-171-3/+1
| | | | | |
| * | | | | Fix TOC ul markupVipul A M2013-06-161-1/+1
| | | | | |
| * | | | | change rails verison to 4.0.0 in command lineVishnu Atrai2013-06-161-7/+7
| | | | | |
| * | | | | reorder finder methods list alphabeticallyMikhail Dieterle2013-06-161-1/+1
| | | | | |
| * | | | | fix quotes and ruby old hashesMikhail Dieterle2013-06-151-4/+4
| | | | | |
| * | | | | Use markdown quotes instead <tt> tagMikhail Dieterle2013-06-151-5/+5
| | | | | |
| * | | | | reword the docrails info [ci skip]Vijay Dev2013-06-151-6/+8
| | | | | |
| * | | | | Update contributing to rails guide to depict new contributing to ↵Vipul A M2013-06-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | documentation info
| * | | | | Change documentation about contributing to DocsVipul A M2013-06-151-6/+6
| | | | | |
| * | | | | Merge pull request #150 from vatrai/edgerails_in_command_lineVishnu Atrai2013-06-151-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | replace version 3.2.3 by 4.0.0.beta in command line
| | * | | | | replace version 3.2.3 by 4.0.0.beta in command lineVishnu Atrai2013-06-151-2/+2
| | | | | | |