Merge pull request #14 from ncsuarc/account_pending

Add argument to account_pending
twinslash · Aug 7, 2014 · 6b2deed · 6b2deed
2 parents 0af1464 + c46e286
commit 6b2deed
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/controllers/redmine_oauth_controller.rb b/app/controllers/redmine_oauth_controller.rb
@@ -71,7 +71,13 @@ def try_to_login info
       if user.active?
         successful_authentication(user)
       else
-        account_pending
+        # Redmine 2.4 adds an argument to account_pending
+        if Redmine::VERSION::MAJOR > 2 or
+          (Redmine::VERSION::MAJOR == 2 and Redmine::VERSION::MINOR >= 4)
+          account_pending(user)
+        else
+          account_pending
+        end
       end
     end
   end