allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [3/3] allura git commit: A few minor tweaks to SSH repo instruction logic:
Date Tue, 19 Jul 2016 19:19:12 GMT
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 <dave@brondsema.net>
Authored: Tue Jul 19 15:15:10 2016 -0400
Committer: Dave Brondsema <dave@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>
     &nbsp;
     <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"</
     &nbsp;
     <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 %}


Mime
View raw message