whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] branch master updated: move require of memapps
Date Fri, 03 Apr 2020 00:20:34 GMT
This is an automated email from the ASF dual-hosted git repository.

rubys 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 cc8376f  move require of memapps
cc8376f is described below

commit cc8376f19e70680a733bbdfc6480a6bc67242a2b
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Thu Apr 2 20:20:14 2020 -0400

    move require of memapps
---
 www/secretary/workbench/server.rb                    | 1 +
 www/secretary/workbench/views/actions/memapp.json.rb | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/secretary/workbench/server.rb b/www/secretary/workbench/server.rb
index 2269853..c05dc30 100644
--- a/www/secretary/workbench/server.rb
+++ b/www/secretary/workbench/server.rb
@@ -42,6 +42,7 @@ module Mail
 end
 
 require 'whimsy/asf'
+require 'whimsy/asf/memapps'
 ASF::Mail.configure
 
 set :show_exceptions, true
diff --git a/www/secretary/workbench/views/actions/memapp.json.rb b/www/secretary/workbench/views/actions/memapp.json.rb
index 21f758e..405ef53 100644
--- a/www/secretary/workbench/views/actions/memapp.json.rb
+++ b/www/secretary/workbench/views/actions/memapp.json.rb
@@ -14,7 +14,6 @@ fileext = File.extname(@selected).downcase if @signature.empty?
 
 # verify that a membership form under that name stem doesn't already exist
 if "#@filename#{fileext}" =~ /\A\w[-\w]*\.?\w*\z/ # check taint requirements
-  require 'asf/whimsy/memapps'
   # returns name if it matches as stem or fully (e.g. for directory)
   form = ASF::MemApps.search @filename.untaint
   if form


Mime
View raw message