Skip to content
Snippets Groups Projects
Commit 6b2deedb authored by Serge Ahranovich's avatar Serge Ahranovich
Browse files

Merge pull request #14 from ncsuarc/account_pending

Add argument to account_pending
parents 0af14640 c46e286b
No related branches found
No related tags found
No related merge requests found
......@@ -70,11 +70,17 @@ class RedmineOauthController < AccountController
# Existing record
if user.active?
successful_authentication(user)
else
# 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
def oauth_client
@client ||= OAuth2::Client.new(settings[:client_id], settings[:client_secret],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment