aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11124 from wangjohn/removing_deprecated_rake_tasksSantiago Pastorino2013-06-263-101/+6
|\
| * Removing deprecated rake tasks.wangjohn2013-06-243-101/+6
* | Merge pull request #11128 from edg3r/patch-1Yves Senn2013-06-261-1/+1
|\ \
| * | linking small rails 4 features image to a bigger one [ci skip]R4K32013-06-271-1/+1
| |/
* | Merge pull request #10828 from southpolesteve/delegation_error_classYves Senn2013-06-262-2/+4
|\ \
| * | 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 tumayun/fix_activerecord_examples_performance_...Rafael Mendonça França2013-06-261-1/+1
|\ \
| * | 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
|\ \ \ | |/ / |/| |
| * | Remove a comment related to 920753fRobin Dupret2013-06-261-1/+0
| * | Mention Content-Type for JSON params parsing.Gustavo Delfino2013-06-241-1/+1
| * | 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
| * | [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 documentatio...Vipul A M2013-06-151-1/+3
| * | 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 lineVishnu Atrai2013-06-151-2/+2
| * | | Merge pull request #146 from vatrai/command_line_rake_guidVishnu Atrai2013-06-151-0/+6
| |\ \ \
| | * | | more guidelines for command lineVishnu Atrai2013-06-141-0/+6
| * | | | Merge pull request #151 from vatrai/action_view_basicVishnu Atrai2013-06-151-0/+17
| |\ \ \ \
| | * | | | date_field docs for action viewVishnu Atrai2013-06-151-0/+17
| * | | | | Change "." to ":" for formatting purposeVipul A M2013-06-151-1/+1
| |/ / / /
| * | / / `dasboard` => `dashboard`Vipul A M2013-06-151-4/+4
| | |/ / | |/| |
| * | | `existant` => `existent`Vipul A M2013-06-151-1/+1
| * | | Merge pull request #142 from codyrobbins/masterVijay Dev2013-06-131-0/+6
| |\ \ \
| | * | | Added a warning about #1769 to the routing guide.Cody Robbins2013-06-071-0/+6
* | | | | Merge pull request #11112 from arunagw/rakefile_changesCarlos Antonio da Silva2013-06-262-9/+1
|\ \ \ \ \
| * | | | | Minor changes to actionpack/actionview RakefileArun Agrawal2013-06-262-9/+1
* | | | | | remove trailing whitespace from `config/routes.rb` template.Yves Senn2013-06-261-1/+1
|/ / / / /
* | | | | Merge pull request #11109 from wangjohn/moving_pluck_and_ids_to_new_delegate_...Yves Senn2013-06-251-8/+9
|\ \ \ \ \
| * | | | | Moving the `pluck` and `ids` methods to their own delegate line.wangjohn2013-06-251-8/+9
|/ / / / /
* | | | | Fix @tenderlove's name in changelog :sparkles:Carlos Antonio da Silva2013-06-261-2/+2
* | | | | Merge pull request #10542 from waseem/remove_requireCarlos Antonio da Silva2013-06-251-1/+0
|\ \ \ \ \
| * | | | | Remove unnecessary require from active_support/inflector/methods.rbWaseem Ahmad2013-05-101-1/+0
* | | | | | Merge pull request #10774 from chuckbergeron/validates-inclusion-of-accuracy-...Carlos Antonio da Silva2013-06-254-4/+15
|\ \ \ \ \ \
| * | | | | | Use Range#cover? for Numeric ranges (tests via endpoints) and use Range#inclu...Charles Bergeron2013-05-274-4/+10
* | | | | | | Merge pull request #10627 from vipulnsward/destructive_symbolizeCarlos Antonio da Silva2013-06-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | change to destructive `deep_symbolize_keys` after https://github.com/rails/ra...Vipul A M2013-05-151-1/+1
* | | | | | | | Merge pull request #10666 from YanhaoYang/masterCarlos Antonio da Silva2013-06-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | make "rails dbconsole" work with activerecord-postgis-adapterYanhaoYang2013-05-171-1/+1