aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* push the before filter lambdas to factory methodsAaron Patterson2013-05-141-40/+58
|
* polymorphic before callbacksAaron Patterson2013-05-141-16/+54
|
* Merge branch 'master' into normalizecbAaron Patterson2013-05-142-2/+3
|\ | | | | | | | | | | * master: private callback methods should work Update mail to minimum version 2.5.4
| * private callback methods should workAaron Patterson2013-05-141-1/+2
| |
| * Update mail to minimum version 2.5.4Mikel Lindsaar2013-05-141-1/+1
| |
* | use a singleton end nodeAaron Patterson2013-05-131-5/+10
| |
* | Revert "we never pass blocks, so remove this"Aaron Patterson2013-05-131-1/+1
| | | | | | | | This reverts commit 9caf0cf9c8c7b42737ae78c470a5dd2f583ada75.
* | if there is nothing to compile, then do not bother compilingAaron Patterson2013-05-131-3/+8
| |
* | Arrays are no longer supportedAaron Patterson2013-05-131-4/+0
| |
* | we never pass blocks, so remove thisAaron Patterson2013-05-131-1/+1
| |
* | raise an argument error if the filter arity is greater than 1Aaron Patterson2013-05-131-12/+6
| |
* | Merge branch 'master' into normalizecbAaron Patterson2013-05-131-0/+40
|\| | | | | | | | | * master: adding more callback type coverage
| * adding more callback type coverageAaron Patterson2013-05-131-0/+40
| |
* | Merge branch 'master' into normalizecbAaron Patterson2013-05-131-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 methodsAaron Patterson2013-05-131-15/+22
| |
| * call extracted method from callback manipulation methodsAaron Patterson2013-05-131-6/+8
| |
| * extract callback param mungingAaron Patterson2013-05-131-3/+8
| |
| * no reason to make these defaulted, we always pass values inAaron Patterson2013-05-131-1/+1
| |
* | pass the actual filter, not a stringAaron Patterson2013-05-132-2/+2
| |
* | Merge branch 'master' into normalizecbAaron Patterson2013-05-1358-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_calbacksAaron Patterson2013-05-131-0/+40
| |
| * Merge pull request #10592 from arunagw/build-fix-flash-hashRafael Mendonça França2013-05-131-2/+2
| |\ | | | | | | Fixing build broken by this change
| | * Fixing build broken by this changeArun Agrawal2013-05-131-2/+2
| |/ | | | | | | c43ca06ca091fc09e2c86bb051ac92b648f12b64
| * Merge pull request #10587 from vipulnsward/indent_varRafael Mendonça França2013-05-121-1/+2
| |\ | | | | | | Extract variable out of loop
| | * Extract variable out of loopVipul A M2013-05-131-1/+2
| | |
| * | Merge pull request #10584 from alindeman/range-missing-alias-attributeRafael Mendonça França2013-05-122-0/+4
| |\ \ | | | | | | | | Fixes NoMethodError: `alias_method_chain` when requiring just active_support/core_ext
| | * | Fixes NoMethodError: `alias_method_chain` when requiring just ↵Andy Lindeman2013-05-122-0/+4
| | |/ | | | | | | | | | | | | | | | active_support/core_ext * Each file that uses `alias_method_chain` brings it in explicitly
| * | Merge pull request #10586 from AJ-Acevedo/commentsRafael Mendonça França2013-05-121-1/+1
| |\ \ | | |/ | |/| Updated comment to Rails 4
| | * Updated comment to Rails 4AJ Acevedo2013-05-121-1/+1
| |/
| * Merge pull request #10581 from shime/better-generator-errorRafael Mendonça França2013-05-121-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-121-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/masterGuillermo Iguaran2013-05-121-9/+3
| |\ \ | | |/ | |/| Code cleanup for ActionDispatch::Flash#call
| | * Code cleanup for ActionDispatch::Flash#callJulian Vargas2013-05-121-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_typosRafael Mendonça França2013-05-123-3/+3
| |\ | | | | | | Fix class and method name typos
| | * Fix class and method name typosVipul A M2013-05-123-3/+3
| | |
| * | Merge pull request #10560 from jkutner/masterRafael Mendonça França2013-05-123-10/+0
| |\ \ | | | | | | | | Remove jruby-openssl from default Gemfile
| | * | Removed jruby-openssl gem from default template GemfileJoe Kutner2013-05-103-10/+0
| | | |
| * | | Fix typo: require -> requiresRafael Mendonça França2013-05-121-1/+1
| | | | | | | | | | | | | | | | [ci skip]
| * | | Add CHANGELOG entry for #10576Rafael Mendonça França2013-05-121-0/+7
| | | | | | | | | | | | | | | | [ci skip]
| * | | Merge pull request #10556 from Empact/deprecate-schema-statements-distinctRafael Mendonça França2013-05-123-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ça2013-05-122-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove some autolinks * Fix the rendered result * Change sql to SQL [ci skip]
| * | | respond_to -> respond to in a message from AM::LintXavier Noria2013-05-121-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 fineXavier Noria2013-05-121-1/+1
| | | |
| * | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-1226-89/+120
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: activesupport/lib/active_support/callbacks.rb
| | * | copy edits [ci skip]Vijay Dev2013-05-121-5/+1
| | | |
| | * | ruby -> RubyPrathamesh Sonpatki2013-05-123-3/+3
| | | |
| | * | added docs for InheritedOptions class [ci skip]Anton Kalyaev2013-05-111-0/+8
| | | |
| | * | Fixed boolean validation example to use inclusion instead of presence on ↵Dana Jones2013-05-101-2/+3
| | | | | | | | | | | | | | | | migrations guide
| | * | RDoc style for ActionMailer::Base#mailZachary Scott2013-05-101-23/+25
| | | |
| | * | Document ActionMailer::Base::default, ::mailer_name, and #mailer_nameZachary Scott2013-05-101-14/+25
| | | |