Merge remote-tracking branch 'upstream/pull/5642'

[rails.git] / app / controllers / concerns / session_methods.rb

diff --git a/app/controllers/concerns/session_methods.rb b/app/controllers/concerns/session_methods.rb
index 4bbfac34f6dff3305b576e343a6e119e95784249..d0fb0c419e726cc85e0443376ccd925bb2bb9863 100644 (file)
--- a/app/controllers/concerns/session_methods.rb
+++ b/app/controllers/concerns/session_methods.rb
@@ -81,13 +81,4 @@ module SessionMethods
 
     session.delete(:remember_me)
   end
-
-  ##
-  #
-  def disable_terms_redirect
-    # this is necessary otherwise going to the user terms page, when
-    # having not agreed already would cause an infinite redirect loop.
-    # it's .now so that this doesn't propagate to other pages.
-    flash.now[:skip_terms] = true
-  end
 end