opendev
/
gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15 

* stable-2.14:
  config-sso: Reword section about Google OpenID shutdown
  Replace links to code.google.com/p/gerrit
  intro-quick: replace http:// with ssh:// in fetch example

Change-Id: I08303d5325a9b970a772c7c9a386040d14cac918
This commit is contained in:
David Pursehouse 2018-02-02 13:39:59 +09:00
parent 8a70d63251 fb6eba1211
commit b13c8ef760
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Documentation/config-sso.txt
View File

@ -64,18 +64,17 @@ Users wishing to link an alternative identity should *NOT* log in separately
with that identity. Doing so will result in a new account being created, and
subsequent attempts to link that account with the existing account will fail.
In cases where this happens, the administrator will need to manually merge the
accounts. See link:https://code.google.com/p/gerrit/wiki/SqlMergeUserAccounts[
accounts. See link:https://gerrit.googlesource.com/homepage/+/md-pages/docs/SqlMergeUserAccounts.md[
Merging Gerrit User Accounts] on the Gerrit Wiki for details.
Linking another identity is also useful for users whose primary OpenID provider
shuts down. For example Google will
shuts down. For example Google
link:https://developers.google.com/+/api/auth-migration[shut down their OpenID
service on 20th April 2015]. Users must add an alternative identity, using another
OpenID provider, before that shutdown date. User who fail to add an alternative
identity before that date, and end up with their account only having a disabled
Google identity, will need to create a separate account with an alternative
provider and then ask the administrator to merge the accounts using the previously
mentioned method.
service on 20th April 2015]. Users who failed to add an alternative identity with
another OpenID provider before that date will end up with their account only having
a disabled Google identity. After creating a separate account with an alternative
provider, they will need to ask the administrator to merge the accounts using the
previously mentioned method.
To link another identity to an existing account:

2
Documentation/dev-design.txt
View File

@ -342,7 +342,7 @@ automate interfaces may make it impossible for non-browser agents
to be used with the JSON-RPC interface.
* link:http://json-rpc.org/wd/JSON-RPC-1-1-WD-20060807.html[JSON-RPC 1.1]
* link:http://code.google.com/p/gerrit/source/browse/README?repo=gwtjsonrpc&name=master[XSRF JSON-RPC]
* link:https://gerrit.googlesource.com/gwtjsonrpc/+/master/README[XSRF JSON-RPC]
== Privacy Considerations

2
Documentation/dev-readme.txt
View File

@ -266,7 +266,7 @@ the browser and on the server side.
Google Web Toolkit:
* http://code.google.com/webtoolkit/download.html[Download]
* http://www.gwtproject.org/download.html[Download]
Apache SSHD: