You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/07/19 19:19:10 UTC
[1/3] allura git commit: Fix for scm-ssh-key to be visible only if
allow upload ssh key is true
Repository: allura
Updated Branches:
refs/heads/master da52a2ca0 -> dd2a0d8ef
Fix for scm-ssh-key to be visible only if allow upload ssh key is true
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/cf4770b2
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/cf4770b2
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/cf4770b2
Branch: refs/heads/master
Commit: cf4770b2ce609e3a988335500459cb4f041b8769
Parents: da52a2c
Author: Rohan Verma <ro...@gmail.com>
Authored: Tue Jul 19 02:31:55 2016 +0530
Committer: Rohan Verma <ro...@gmail.com>
Committed: Tue Jul 19 02:34:27 2016 +0530
----------------------------------------------------------------------
Allura/development.ini | 5 ++++-
ForgeGit/forgegit/templates/git/index.html | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/cf4770b2/Allura/development.ini
----------------------------------------------------------------------
diff --git a/Allura/development.ini b/Allura/development.ini
index 89566a7..79949bd 100644
--- a/Allura/development.ini
+++ b/Allura/development.ini
@@ -176,7 +176,6 @@ auth.allow_user_registration = true
auth.allow_user_to_disable_account = true
auth.allow_edit_prefs = true
auth.allow_password_change = true
-auth.allow_upload_ssh_key = false
auth.allow_user_messages_config = true
auth.allow_birth_date = true
auth.allow_non_primary_email_password_reset = true
@@ -184,6 +183,10 @@ auth.require_email_addr = true
; List of social network options to use on user account settings
socialnetworks = Facebook, Linkedin, Twitter, Google+
+; Allow uploading ssh key, optionally set auth preferences url
+auth.allow_upload_ssh_key = false
+auth.preferences_url = /auth/preferences/
+
; In seconds
auth.recovery_hash_expiry_period = 600
http://git-wip-us.apache.org/repos/asf/allura/blob/cf4770b2/ForgeGit/forgegit/templates/git/index.html
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/templates/git/index.html b/ForgeGit/forgegit/templates/git/index.html
index 400f016..4d6fd15 100644
--- a/ForgeGit/forgegit/templates/git/index.html
+++ b/ForgeGit/forgegit/templates/git/index.html
@@ -76,7 +76,8 @@ git push -u origin master</pre>
<div class="message info scm-ssh-key">
<div class="content">
- Did you get asked for your {{config.site_name}} password during this process? You can securely use your Git repository and avoid having to re-enter your password by <a href="https://{{config.domain}}/account/ssh">setting up an ssh-key</a>.
+ {% if h.asbool(config.get('auth.allow_upload_ssh_key', True)) %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your Git repository and avoid having to re-enter your password by <a href="{{config.get('auth.preferences_url')}}">setting up an ssh-key</a>.
+ {% else %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your Git repository and avoid having to re-enter your password by asking your server admin to enable uploading ssh keys</a>. {% endif %}
</div>
</div>
{% else %}
[3/3] allura git commit: A few minor tweaks to SSH repo instruction
logic:
Posted by br...@apache.org.
A few minor tweaks to SSH repo instruction logic:
* more specific config name
* say "SVN" not "Git" on svn template
* safer defaults if the config values aren't set at all
* remove extraneous </a>
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/dd2a0d8e
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/dd2a0d8e
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/dd2a0d8e
Branch: refs/heads/master
Commit: dd2a0d8efd4c5c9f61556ee100e09d4462783c6d
Parents: 9153fc0
Author: Dave Brondsema <da...@brondsema.net>
Authored: Tue Jul 19 15:15:10 2016 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Tue Jul 19 15:15:10 2016 -0400
----------------------------------------------------------------------
Allura/development.ini | 4 ++--
ForgeGit/forgegit/templates/git/index.html | 4 ++--
ForgeSVN/forgesvn/templates/svn/index.html | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/dd2a0d8e/Allura/development.ini
----------------------------------------------------------------------
diff --git a/Allura/development.ini b/Allura/development.ini
index 79949bd..e4e0ffc 100644
--- a/Allura/development.ini
+++ b/Allura/development.ini
@@ -183,9 +183,9 @@ auth.require_email_addr = true
; List of social network options to use on user account settings
socialnetworks = Facebook, Linkedin, Twitter, Google+
-; Allow uploading ssh key, optionally set auth preferences url
+; Allow uploading ssh key, optionally set ssh preferences url
auth.allow_upload_ssh_key = false
-auth.preferences_url = /auth/preferences/
+auth.upload_ssh_url = /auth/preferences/
; In seconds
auth.recovery_hash_expiry_period = 600
http://git-wip-us.apache.org/repos/asf/allura/blob/dd2a0d8e/ForgeGit/forgegit/templates/git/index.html
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/templates/git/index.html b/ForgeGit/forgegit/templates/git/index.html
index 4d6fd15..4eaa869 100644
--- a/ForgeGit/forgegit/templates/git/index.html
+++ b/ForgeGit/forgegit/templates/git/index.html
@@ -76,8 +76,8 @@ git push -u origin master</pre>
<div class="message info scm-ssh-key">
<div class="content">
- {% if h.asbool(config.get('auth.allow_upload_ssh_key', True)) %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your Git repository and avoid having to re-enter your password by <a href="{{config.get('auth.preferences_url')}}">setting up an ssh-key</a>.
- {% else %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your Git repository and avoid having to re-enter your password by asking your server admin to enable uploading ssh keys</a>. {% endif %}
+ {% if h.asbool(config.get('auth.allow_upload_ssh_key')) %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your Git repository and avoid having to re-enter your password by <a href="{{config.get('auth.upload_ssh_url', '/auth/preferences/')}}">setting up an ssh-key</a>.
+ {% else %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your Git repository and avoid having to re-enter your password by asking your server admin to enable uploading ssh keys. {% endif %}
</div>
</div>
{% else %}
http://git-wip-us.apache.org/repos/asf/allura/blob/dd2a0d8e/ForgeSVN/forgesvn/templates/svn/index.html
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/templates/svn/index.html b/ForgeSVN/forgesvn/templates/svn/index.html
index d074d1c..53f2e73 100644
--- a/ForgeSVN/forgesvn/templates/svn/index.html
+++ b/ForgeSVN/forgesvn/templates/svn/index.html
@@ -88,8 +88,8 @@ svn import {{c.app.repo.clone_url('rw', c.user.username)}} -m "Initial commit"</
<div class="message info scm-ssh-key">
<div class="content">
- {% if h.asbool(config.get('auth.allow_upload_ssh_key', True)) %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your Git repository and avoid having to re-enter your password by <a href="{{config.get('auth.preferences_url')}}">setting up an ssh-key</a>.
- {% else %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your Git repository and avoid having to re-enter your password by asking your server admin to enable uploading ssh keys</a>. {% endif %}
+ {% if h.asbool(config.get('auth.allow_upload_ssh_key')) %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your SVN repository and avoid having to re-enter your password by <a href="{{config.get('auth.upload_ssh_url', '/auth/preferences/')}}">setting up an ssh-key</a>.
+ {% else %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your SVN repository and avoid having to re-enter your password by asking your server admin to enable uploading ssh keys. {% endif %}
</div>
</div>
{% else %}
[2/3] allura git commit: Update template for SVN
Posted by br...@apache.org.
Update template for SVN
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/9153fc05
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/9153fc05
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/9153fc05
Branch: refs/heads/master
Commit: 9153fc05333e2568759831d093004ac493cfd7c1
Parents: cf4770b
Author: Rohan Verma <ro...@gmail.com>
Authored: Tue Jul 19 02:46:39 2016 +0530
Committer: Rohan Verma <ro...@gmail.com>
Committed: Tue Jul 19 02:46:39 2016 +0530
----------------------------------------------------------------------
ForgeSVN/forgesvn/templates/svn/index.html | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/9153fc05/ForgeSVN/forgesvn/templates/svn/index.html
----------------------------------------------------------------------
diff --git a/ForgeSVN/forgesvn/templates/svn/index.html b/ForgeSVN/forgesvn/templates/svn/index.html
index 4849e89..d074d1c 100644
--- a/ForgeSVN/forgesvn/templates/svn/index.html
+++ b/ForgeSVN/forgesvn/templates/svn/index.html
@@ -88,7 +88,8 @@ svn import {{c.app.repo.clone_url('rw', c.user.username)}} -m "Initial commit"</
<div class="message info scm-ssh-key">
<div class="content">
- Did you get asked for your {{config.site_name}} password during this process? You can securely use your Subversion repository and avoid having to re-enter your password by <a href="https://{{config.domain}}/account/ssh">setting up an ssh-key</a>.
+ {% if h.asbool(config.get('auth.allow_upload_ssh_key', True)) %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your Git repository and avoid having to re-enter your password by <a href="{{config.get('auth.preferences_url')}}">setting up an ssh-key</a>.
+ {% else %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your Git repository and avoid having to re-enter your password by asking your server admin to enable uploading ssh keys</a>. {% endif %}
</div>
</div>
{% else %}