aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-04-04 17:26:30 +0100
committerPratik Naik <pratiknaik@gmail.com>2009-04-04 17:26:30 +0100
commit4fe6d43cabe3bb2e094f308d010209c78005a3b9 (patch)
tree5276f0fcb5dd15fb0b2334edc9409945d95fc3bd
parent86a083d5ad62d4e0a72306cf051e80bdaf5288f0 (diff)
downloadrails-4fe6d43cabe3bb2e094f308d010209c78005a3b9.tar.gz
rails-4fe6d43cabe3bb2e094f308d010209c78005a3b9.tar.bz2
rails-4fe6d43cabe3bb2e094f308d010209c78005a3b9.zip
No whitespaces please
-rw-r--r--actionpack/lib/action_controller/base.rb6
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql_adapter.rb2
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index e5faf7e1a2..0b58c38fb5 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -1337,7 +1337,7 @@ module ActionController #:nodoc:
end
end
end
-
+
# Returns true if a render or redirect has already been performed.
def performed?
@performed_render || @performed_redirect
@@ -1346,7 +1346,7 @@ module ActionController #:nodoc:
def assign_names
@action_name = (params['action'] || 'index')
end
-
+
# Returns a set of the methods defined as actions in your controller
def action_methods
self.class.action_methods
@@ -1373,7 +1373,7 @@ module ActionController #:nodoc:
# otherwise you'd get different results if calling it more than once
@request_origin ||= "#{request.remote_ip} at #{Time.now.to_s(:db)}"
end
-
+
# Returns the request URI used to get to the current location
def complete_request_uri
"#{request.protocol}#{request.host}#{request.request_uri}"
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 8e4078f462..9300df28ee 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -266,7 +266,7 @@ module ActiveRecord
update("SET FOREIGN_KEY_CHECKS = #{old}")
end
end
-
+
# CONNECTION MANAGEMENT ====================================
def active?