You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by se...@apache.org on 2020/06/29 16:13:02 UTC
[whimsy] branch master updated: Use replace magic URLs
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 961b49d Use replace magic URLs
961b49d is described below
commit 961b49d55467fc75ef515224f3b8fb9ee11c191d
Author: Sebb <se...@apache.org>
AuthorDate: Mon Jun 29 17:12:53 2020 +0100
Use replace magic URLs
---
www/secretary/workbench/server.rb | 2 +-
www/secretary/workbench/views/actions/ccla.json.rb | 2 +-
www/secretary/workbench/views/actions/emeritus-request.json.rb | 2 +-
www/secretary/workbench/views/actions/grant.json.rb | 2 +-
www/secretary/workbench/views/actions/icla.json.rb | 2 +-
www/secretary/workbench/views/actions/icla2.json.rb | 2 +-
www/secretary/workbench/views/actions/memapp.json.rb | 2 +-
www/secretary/workbench/views/parts.html.rb | 6 +++---
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/www/secretary/workbench/server.rb b/www/secretary/workbench/server.rb
index 5b59c16..b59e2a8 100644
--- a/www/secretary/workbench/server.rb
+++ b/www/secretary/workbench/server.rb
@@ -249,7 +249,7 @@ end
# redirect to an icla
get %r{/icla/(.*)} do |filename|
- checkout = 'https://svn.apache.org/repos/private/documents/iclas'
+ checkout = ASF::SVN.svnurl('iclas')
file = ASF::ICLAFiles.match_claRef(filename)
pass unless file
redirect to(checkout + '/' + file)
diff --git a/www/secretary/workbench/views/actions/ccla.json.rb b/www/secretary/workbench/views/actions/ccla.json.rb
index 5fde27a..5eb66b4 100644
--- a/www/secretary/workbench/views/actions/ccla.json.rb
+++ b/www/secretary/workbench/views/actions/ccla.json.rb
@@ -49,7 +49,7 @@ task "svn commit documents/cclas/#@filename#{fileext}" do
complete do |dir|
# checkout empty directory
svn 'checkout', '--depth', 'empty',
- 'https://svn.apache.org/repos/private/documents/cclas', "#{dir}/cclas"
+ ASF::SVN.svnurl('cclas'), "#{dir}/cclas"
# create/add file(s)
dest = message.write_svn("#{dir}/cclas", @filename, @selected, @signature)
diff --git a/www/secretary/workbench/views/actions/emeritus-request.json.rb b/www/secretary/workbench/views/actions/emeritus-request.json.rb
index cbf0c7c..d55a0ec 100644
--- a/www/secretary/workbench/views/actions/emeritus-request.json.rb
+++ b/www/secretary/workbench/views/actions/emeritus-request.json.rb
@@ -44,7 +44,7 @@ task "svn commit documents/emeritus-requests-received/#{emeritus_request}" do
dest = "#{dir}/emeritus-requests-received"
# checkout empty directory
svn 'checkout', '--depth', 'empty',
- 'https://svn.apache.org/repos/private/documents/emeritus-requests-received',
+ ASF::SVN.svnurl('emeritus-requests-received'),
dest
message.write_svn(dest, @filename, @selected, @signature)
diff --git a/www/secretary/workbench/views/actions/grant.json.rb b/www/secretary/workbench/views/actions/grant.json.rb
index c8fac49..30afa7f 100644
--- a/www/secretary/workbench/views/actions/grant.json.rb
+++ b/www/secretary/workbench/views/actions/grant.json.rb
@@ -49,7 +49,7 @@ task "svn commit documents/grants/#@filename#{fileext}" do
complete do |dir|
# checkout empty directory
svn 'checkout', '--depth', 'empty',
- 'https://svn.apache.org/repos/private/documents/grants', "#{dir}/grants"
+ ASF::SVN.svnurl('grants'), "#{dir}/grants"
# create/add file(s)
dest = message.write_svn("#{dir}/grants", @filename, @selected, @signature)
diff --git a/www/secretary/workbench/views/actions/icla.json.rb b/www/secretary/workbench/views/actions/icla.json.rb
index 15649df..ae9fbd3 100644
--- a/www/secretary/workbench/views/actions/icla.json.rb
+++ b/www/secretary/workbench/views/actions/icla.json.rb
@@ -62,7 +62,7 @@ task "svn commit documents/iclas/#@filename#{fileext}" do
complete do |dir|
# checkout empty directory
svn 'checkout', '--depth', 'empty',
- 'https://svn.apache.org/repos/private/documents/iclas', "#{dir}/iclas"
+ ASF::SVN.svnurl('iclas'), "#{dir}/iclas"
# create/add file(s)
if @signature.to_s.empty? or fileext != '.pdf'
diff --git a/www/secretary/workbench/views/actions/icla2.json.rb b/www/secretary/workbench/views/actions/icla2.json.rb
index 48de802..e87814d 100644
--- a/www/secretary/workbench/views/actions/icla2.json.rb
+++ b/www/secretary/workbench/views/actions/icla2.json.rb
@@ -39,7 +39,7 @@ if not ASF::ICLAFiles.Dir? @filename
complete do |dir|
# checkout empty iclas directory
svn 'checkout', '--depth', 'empty',
- 'https://svn.apache.org/repos/private/documents/iclas', "#{dir}/iclas"
+ ASF::SVN.svnurl('iclas'), "#{dir}/iclas"
# update file to be moved
svn 'update', "#{dir}/iclas/#{@existing}"
diff --git a/www/secretary/workbench/views/actions/memapp.json.rb b/www/secretary/workbench/views/actions/memapp.json.rb
index a9a4527..c3c2e24 100644
--- a/www/secretary/workbench/views/actions/memapp.json.rb
+++ b/www/secretary/workbench/views/actions/memapp.json.rb
@@ -47,7 +47,7 @@ task "svn commit documents/member_apps/#@filename#{fileext}" do
complete do |dir|
# checkout empty directory
svn 'checkout', '--depth', 'empty',
- 'https://svn.apache.org/repos/private/documents/member_apps',
+ ASF::SVN.svnurl('member_apps'),
"#{dir}/member_apps"
# create/add file(s)
diff --git a/www/secretary/workbench/views/parts.html.rb b/www/secretary/workbench/views/parts.html.rb
index a8f4a76..3bf044d 100644
--- a/www/secretary/workbench/views/parts.html.rb
+++ b/www/secretary/workbench/views/parts.html.rb
@@ -42,15 +42,15 @@ _html do
end
_li do
_a 'ICLAs', target: 'content',
- href: 'https://svn.apache.org/repos/private/documents/iclas'
+ href: ASF::SVN.svnurl('iclas')
end
_li do
_a 'CCLAs', target: 'content',
- href: 'https://svn.apache.org/repos/private/documents/cclas'
+ href: ASF::SVN.svnurl('cclas')
end
_li do
_a 'Grants', target: 'content',
- href: 'https://svn.apache.org/repos/private/documents/grants'
+ href: ASF::SVN.svnurl('grants')
end
_li do
_a 'Incubator', target: 'content',