Merge branch 'stable-2.10' into stable-2.11

* stable-2.10:
  Update version to 2.10.2
  Release notes for Gerrit 2.10.2
  Do not return 403 when clicking on Gitweb breadcrumb
  Add log messages to troubleshoot OAuth/OpenID linking
  Remove unused OAuthToken in authorisation URL
  OnlineReindexer: log the success/failure numbers on exit
  Update replication plugin
  OAuth: Allow to link claimed identity to existing accounts
  OAuth: Allow to change username

Change-Id: Ia9fc371b9f957c8e0fc3e215084baa3d31dadd41
This commit is contained in:
David Pursehouse
2015-03-29 20:49:13 +01:00
9 changed files with 94 additions and 22 deletions

View File

@@ -144,6 +144,7 @@ class OpenIdServiceImpl {
final AuthRequest aReq;
try {
aReq = manager.authenticate(state.discovered, state.retTo.toString());
log.debug("OpenID: openid-realm={}", state.contextUrl);
aReq.setRealm(state.contextUrl);
if (requestRegistration(aReq)) {