Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #11144 from kennyj/fix_copyright_year | Guillermo Iguaran | 2013-06-27 | 1 | -1/+1 |
|\ | | | | | Fix copyright year for actionview [ci skip] | ||||
| * | Fix copyright year for actionview [ci skip] | kennyj | 2013-06-28 | 1 | -1/+1 |
|/ | |||||
* | Fix punctuation in config templates | Akira Matsuda | 2013-06-28 | 2 | -2/+2 |
| | |||||
* | Merge pull request #11142 from tumayun/use_master_branch_activesupport | Rafael Mendonça França | 2013-06-27 | 1 | -1/+1 |
|\ | | | | | activerecord/examples/simple.rb use master branch activesupport gem | ||||
| * | activerecord/examples/simple.rb use master branch activesupport gem | tumayun | 2013-06-27 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #11139 from prathamesh-sonpatki/grammar | Yves Senn | 2013-06-27 | 1 | -3/+3 |
|\ | | | | | fix grammar, change 'an' to 'a' [ci skip] | ||||
| * | fix grammar, change 'an' to 'a' [ci skip] | Prathamesh Sonpatki | 2013-06-27 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #11054 from senny/11048_make_default_value_explicit | Carlos Antonio da Silva | 2013-06-27 | 1 | -4/+2 |
|\ \ | | | | | | | make default value for `:message` on `AM::Errors` explicit. | ||||
| * | | make default value for `:message` on `AM::Errors` explicit. | Yves Senn | 2013-06-22 | 1 | -4/+2 |
| | | | |||||
* | | | Merge pull request #11133 from wangjohn/remove_deprecation_rake_task | Yves Senn | 2013-06-27 | 1 | -18/+0 |
|\ \ \ | |_|/ |/| | | Removing deprecation message and silencing method. | ||||
| * | | Removing deprecation message and silencing method. | wangjohn | 2013-06-26 | 1 | -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/rails4 | Yves Senn | 2013-06-27 | 1 | -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 Sonpatki | 2013-06-27 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #11137 from WvanLelyveld/master | Steve Klabnik | 2013-06-27 | 1 | -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/middleware | Wouter van Lelyveld | 2013-06-27 | 1 | -1/+1 |
|/ / | |||||
* | | Review railties changelog [ci skip] | Carlos Antonio da Silva | 2013-06-26 | 1 | -5/+4 |
| | | |||||
* | | Move delegation error constant to inside Module | Carlos Antonio da Silva | 2013-06-26 | 2 | -3/+5 |
| | | |||||
* | | Merge pull request #11124 from wangjohn/removing_deprecated_rake_tasks | Santiago Pastorino | 2013-06-26 | 3 | -101/+6 |
|\ \ | | | | | | | Removing deprecated rake tasks for tests | ||||
| * | | Removing deprecated rake tasks. | wangjohn | 2013-06-24 | 3 | -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-1 | Yves Senn | 2013-06-26 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | linking small rails 4 features image to a bigger one | ||||
| * | | | linking small rails 4 features image to a bigger one [ci skip] | R4K3 | 2013-06-27 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | View a bigger version onclick https://github.com/rails/rails/issues/11100 | ||||
* | | | Merge pull request #10828 from southpolesteve/delegation_error_class | Yves Senn | 2013-06-26 | 2 | -2/+4 |
|\ \ \ | | | | | | | | | Create DelegationError class | ||||
| * | | | Add DelegationError class. Rasied by delegation to a nil object | Steve Faulkner | 2013-06-26 | 2 | -2/+4 |
| | | | | |||||
* | | | | mention the removal of `--builder` in 4.0 release notes. | Yves Senn | 2013-06-26 | 1 | -0/+4 |
| |/ / |/| | | |||||
* | | | Merge pull request #11126 from ↵ | Rafael Mendonça França | 2013-06-26 | 1 | -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 error | tumayun | 2013-06-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-06-26 | 16 | -37/+69 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Conflicts: guides/source/layout.html.erb | ||||
| * | | | Remove a comment related to 920753f | Robin Dupret | 2013-06-26 | 1 | -1/+0 |
| | | | | | | | | | | | | Since 920753f, double assignment isn't used anymore | ||||
| * | | | Mention Content-Type for JSON params parsing. | Gustavo Delfino | 2013-06-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/8501021/rails-json-request-is-not-parsed-correctly-into-post-parameters | ||||
| * | | | Added markdown tag for highlight | Anton Cherepanov | 2013-06-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | [doc] Info added for tmp:create [ci skip] | Rashmi Yadav | 2013-06-23 | 1 | -1/+2 |
| | | | | |||||
| * | | | Missing mention about a generated file [ci skip] | Robin Dupret | 2013-06-22 | 1 | -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 invalid | Rashmi Yadav | 2013-06-19 | 1 | -2/+2 |
| | | | | |||||
| * | | | rewrote render tag using more succinct and idiomatic way | Chandresh Pant | 2013-06-17 | 1 | -3/+1 |
| | | | | |||||
| * | | | Fix TOC ul markup | Vipul A M | 2013-06-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | change rails verison to 4.0.0 in command line | Vishnu Atrai | 2013-06-16 | 1 | -7/+7 |
| | | | | |||||
| * | | | reorder finder methods list alphabetically | Mikhail Dieterle | 2013-06-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix quotes and ruby old hashes | Mikhail Dieterle | 2013-06-15 | 1 | -4/+4 |
| | | | | |||||
| * | | | Use markdown quotes instead <tt> tag | Mikhail Dieterle | 2013-06-15 | 1 | -5/+5 |
| | | | | |||||
| * | | | reword the docrails info [ci skip] | Vijay Dev | 2013-06-15 | 1 | -6/+8 |
| | | | | |||||
| * | | | Update contributing to rails guide to depict new contributing to ↵ | Vipul A M | 2013-06-15 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | documentation info | ||||
| * | | | Change documentation about contributing to Docs | Vipul A M | 2013-06-15 | 1 | -6/+6 |
| | | | | |||||
| * | | | Merge pull request #150 from vatrai/edgerails_in_command_line | Vishnu Atrai | 2013-06-15 | 1 | -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 line | Vishnu Atrai | 2013-06-15 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #146 from vatrai/command_line_rake_guid | Vishnu Atrai | 2013-06-15 | 1 | -0/+6 |
| |\ \ \ \ | | | | | | | | | | | | | more guidelines for rake tasks | ||||
| | * | | | | more guidelines for command line | Vishnu Atrai | 2013-06-14 | 1 | -0/+6 |
| | | | | | | |||||
| * | | | | | Merge pull request #151 from vatrai/action_view_basic | Vishnu Atrai | 2013-06-15 | 1 | -0/+17 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | date_field docs for action view | ||||
| | * | | | | | date_field docs for action view | Vishnu Atrai | 2013-06-15 | 1 | -0/+17 |
| | | | | | | | |||||
| * | | | | | | Change "." to ":" for formatting purpose | Vipul A M | 2013-06-15 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | / / / | `dasboard` => `dashboard` | Vipul A M | 2013-06-15 | 1 | -4/+4 |
| | |/ / / | |/| | | |