Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | raise an argument error if the filter arity is greater than 1 | Aaron Patterson | 2013-05-13 | 1 | -12/+6 |
| | |||||
* | Merge branch 'master' into normalizecb | Aaron Patterson | 2013-05-13 | 1 | -0/+40 |
|\ | | | | | | | | | * master: adding more callback type coverage | ||||
| * | adding more callback type coverage | Aaron Patterson | 2013-05-13 | 1 | -0/+40 |
| | | |||||
* | | Merge branch 'master' into normalizecb | Aaron Patterson | 2013-05-13 | 1 | -20/+34 |
|\| | | | | | | | | | | | | | | | | | | | | | * master: extract getting an setting callbacks to methods call extracted method from callback manipulation methods extract callback param munging no reason to make these defaulted, we always pass values in Conflicts: activesupport/lib/active_support/callbacks.rb | ||||
| * | extract getting an setting callbacks to methods | Aaron Patterson | 2013-05-13 | 1 | -15/+22 |
| | | |||||
| * | call extracted method from callback manipulation methods | Aaron Patterson | 2013-05-13 | 1 | -6/+8 |
| | | |||||
| * | extract callback param munging | Aaron Patterson | 2013-05-13 | 1 | -3/+8 |
| | | |||||
| * | no reason to make these defaulted, we always pass values in | Aaron Patterson | 2013-05-13 | 1 | -1/+1 |
| | | |||||
* | | pass the actual filter, not a string | Aaron Patterson | 2013-05-13 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into normalizecb | Aaron Patterson | 2013-05-13 | 58 | -214/+360 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (61 commits) add tests for reset_calbacks Fixing build broken by this change Extract variable out of loop Updated comment to Rails 4 Fixes NoMethodError: `alias_method_chain` when requiring just active_support/core_ext better error message when app name is not passed in `rails new` Code cleanup for ActionDispatch::Flash#call Fix typo: require -> requires Add CHANGELOG entry for #10576 Merge pull request #10556 from Empact/deprecate-schema-statements-distinct Some editorial changes on the documentation. respond_to -> respond to in a message from AM::Lint specify that dom_(id|class) are deprecated in controllers, views are fine copy edits [ci skip] Fix class and method name typos Replace multi_json with json ruby -> Ruby Adding documentation to the automatic inverse_of finder. Improve CHANGELOG entry [ci kip] Call assume_migrated_upto_version on connection ... Conflicts: activesupport/lib/active_support/callbacks.rb | ||||
| * | add tests for reset_calbacks | Aaron Patterson | 2013-05-13 | 1 | -0/+40 |
| | | |||||
| * | Merge pull request #10592 from arunagw/build-fix-flash-hash | Rafael Mendonça França | 2013-05-13 | 1 | -2/+2 |
| |\ | | | | | | | Fixing build broken by this change | ||||
| | * | Fixing build broken by this change | Arun Agrawal | 2013-05-13 | 1 | -2/+2 |
| |/ | | | | | | | c43ca06ca091fc09e2c86bb051ac92b648f12b64 | ||||
| * | Merge pull request #10587 from vipulnsward/indent_var | Rafael Mendonça França | 2013-05-12 | 1 | -1/+2 |
| |\ | | | | | | | Extract variable out of loop | ||||
| | * | Extract variable out of loop | Vipul A M | 2013-05-13 | 1 | -1/+2 |
| | | | |||||
| * | | Merge pull request #10584 from alindeman/range-missing-alias-attribute | Rafael Mendonça França | 2013-05-12 | 2 | -0/+4 |
| |\ \ | | | | | | | | | Fixes NoMethodError: `alias_method_chain` when requiring just active_support/core_ext | ||||
| | * | | Fixes NoMethodError: `alias_method_chain` when requiring just ↵ | Andy Lindeman | 2013-05-12 | 2 | -0/+4 |
| | |/ | | | | | | | | | | | | | | | | active_support/core_ext * Each file that uses `alias_method_chain` brings it in explicitly | ||||
| * | | Merge pull request #10586 from AJ-Acevedo/comments | Rafael Mendonça França | 2013-05-12 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | Updated comment to Rails 4 | ||||
| | * | Updated comment to Rails 4 | AJ Acevedo | 2013-05-12 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #10581 from shime/better-generator-error | Rafael Mendonça França | 2013-05-12 | 1 | -1/+9 |
| |\ | | | | | | | better error message when app name is not passed in `rails new` | ||||
| | * | better error message when app name is not passed in `rails new` | Hrvoje Šimić | 2013-05-12 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, for the following command: $ rails new we received "Options should be given after the application name" as an error message. This is outdated and should be "Application name should be provided in arguments". | ||||
| * | | Merge pull request #10580 from CodeTag/master | Guillermo Iguaran | 2013-05-12 | 1 | -9/+3 |
| |\ \ | | |/ | |/| | Code cleanup for ActionDispatch::Flash#call | ||||
| | * | Code cleanup for ActionDispatch::Flash#call | Julian Vargas | 2013-05-12 | 1 | -9/+3 |
| |/ | | | | | | | | | | | | | The nested `if` was replaced by using `presence` which takes account for the given hash when it is `nil` or when it is empty. The `else` was removed because what it was doing was to assign to `env[KEY]` the value it already had. | ||||
| * | Merge pull request #10577 from vipulnsward/fix_method_typos | Rafael Mendonça França | 2013-05-12 | 3 | -3/+3 |
| |\ | | | | | | | Fix class and method name typos | ||||
| | * | Fix class and method name typos | Vipul A M | 2013-05-12 | 3 | -3/+3 |
| | | | |||||
| * | | Merge pull request #10560 from jkutner/master | Rafael Mendonça França | 2013-05-12 | 3 | -10/+0 |
| |\ \ | | | | | | | | | Remove jruby-openssl from default Gemfile | ||||
| | * | | Removed jruby-openssl gem from default template Gemfile | Joe Kutner | 2013-05-10 | 3 | -10/+0 |
| | | | | |||||
| * | | | Fix typo: require -> requires | Rafael Mendonça França | 2013-05-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | Add CHANGELOG entry for #10576 | Rafael Mendonça França | 2013-05-12 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | Merge pull request #10556 from Empact/deprecate-schema-statements-distinct | Rafael Mendonça França | 2013-05-12 | 3 | -13/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | Deprecate SchemaStatements#distinct, and make SchemaStatements#columns_for_distinct nodoc. Conflicts: activerecord/CHANGELOG.md | ||||
| * | | | Some editorial changes on the documentation. | Rafael Mendonça França | 2013-05-12 | 2 | -27/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove some autolinks * Fix the rendered result * Change sql to SQL [ci skip] | ||||
| * | | | respond_to -> respond to in a message from AM::Lint | Xavier Noria | 2013-05-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error message uses English to say that the object should respond to a certain method. You check that with respond_to, but that's not English. This makes this error message also consistent with the rest. | ||||
| * | | | specify that dom_(id|class) are deprecated in controllers, views are fine | Xavier Noria | 2013-05-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-05-12 | 26 | -89/+120 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb | ||||
| | * | | copy edits [ci skip] | Vijay Dev | 2013-05-12 | 1 | -5/+1 |
| | | | | |||||
| | * | | ruby -> Ruby | Prathamesh Sonpatki | 2013-05-12 | 3 | -3/+3 |
| | | | | |||||
| | * | | added docs for InheritedOptions class [ci skip] | Anton Kalyaev | 2013-05-11 | 1 | -0/+8 |
| | | | | |||||
| | * | | Fixed boolean validation example to use inclusion instead of presence on ↵ | Dana Jones | 2013-05-10 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | migrations guide | ||||
| | * | | RDoc style for ActionMailer::Base#mail | Zachary Scott | 2013-05-10 | 1 | -23/+25 |
| | | | | |||||
| | * | | Document ActionMailer::Base::default, ::mailer_name, and #mailer_name | Zachary Scott | 2013-05-10 | 1 | -14/+25 |
| | | | | |||||
| | * | | Added documentation for ↵ | aditya-kapoor | 2013-05-10 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | ActiveRecord::Generators::MigrationGenerator.next_migration_number | ||||
| | * | | Added documentation for ActiveRecord::Base#next_migration_number | aditya-kapoor | 2013-05-09 | 1 | -0/+5 |
| | | | | |||||
| | * | | changed rails -> Rails at two places | aditya-kapoor | 2013-05-09 | 2 | -2/+2 |
| | | | | |||||
| | * | | minor rdoc cleanup for reflection methods | Neeraj Singh | 2013-05-09 | 1 | -4/+4 |
| | | | | |||||
| | * | | Fix Typo xml -> XML, json -> JSON | Prathamesh Sonpatki | 2013-05-08 | 1 | -2/+2 |
| | | | | |||||
| | * | | Changed spelling of Busines to Business | aditya-kapoor | 2013-05-08 | 1 | -1/+1 |
| | | | | |||||
| | * | | according to @fxn it's ERB not ERb. | Yves Senn | 2013-05-07 | 1 | -2/+1 |
| | | | | |||||
| | * | | XML-files isn't a word | Waynn Lue | 2013-05-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix grammar on AM.mailer_name documentation. | Hendy Tanata | 2013-05-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Improve model generator USAGE grammar | Matthew Michihara | 2013-05-05 | 1 | -5/+5 |
| | | | |