From e4f015e4e88ff43e8663031db0f37c712339515c Mon Sep 17 00:00:00 2001
From: Arthur Nogueira Neves <arthurnn@gmail.com>
Date: Fri, 19 Dec 2014 18:21:43 -0500
Subject: [PATCH] Merge pull request #18102 from arthurnn/nodoc_constant

Add nodoc to some constants [skip ci]
---
 .../lib/action_controller/metal/request_forgery_protection.rb   | 1 +
 activerecord/lib/active_record/transactions.rb                  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
index fd20682f8f..d1fab27e17 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -209,6 +209,7 @@ module ActionController #:nodoc:
         forgery_protection_strategy.new(self).handle_unverified_request
       end
 
+      #:nodoc:
       CROSS_ORIGIN_JAVASCRIPT_WARNING = "Security warning: an embedded " \
         "<script> tag on another site requested protected JavaScript. " \
         "If you know what you're doing, go ahead and disable forgery " \
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb
index 01e8f69b02..c4a97db582 100644
--- a/activerecord/lib/active_record/transactions.rb
+++ b/activerecord/lib/active_record/transactions.rb
@@ -2,7 +2,9 @@ module ActiveRecord
   # See ActiveRecord::Transactions::ClassMethods for documentation.
   module Transactions
     extend ActiveSupport::Concern
+    #:nodoc:
     ACTIONS = [:create, :destroy, :update]
+    #:nodoc:
     CALLBACK_WARN_MESSAGE = "Currently, Active Record suppresses errors raised " \
       "within `after_rollback`/`after_commit` callbacks and only print them to " \
       "the logs. In the next version, these errors will no longer be suppressed. " \