Permalink
Browse files

Merge pull request #7943 from NARKOZ/patch-4

remove 'then' from conditional statement
  • Loading branch information...
2 parents ca618d4 + ecee641 commit 1974911b8d5780ec16e138027a0099bd8482f88f @jeremy jeremy committed Oct 14, 2012
Showing with 4 additions and 2 deletions.
  1. +4 −2 actionpack/lib/abstract_controller/base.rb
@@ -217,8 +217,10 @@ def _handle_action_missing(*args)
# * <tt>string</tt> - The name of the method that handles the action
# * <tt>nil</tt> - No method name could be found. Raise ActionNotFound.
def method_for_action(action_name)
- if action_method?(action_name) then action_name
- elsif respond_to?(:action_missing, true) then "_handle_action_missing"
+ if action_method?(action_name)
+ action_name
+ elsif respond_to?(:action_missing, true)
+ "_handle_action_missing"
end
end
end

0 comments on commit 1974911

Please sign in to comment.