whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [whimsy] branch master updated: These are files, so use File.join
Date Mon, 29 Jun 2020 21:39:53 GMT
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 28f542b  These are files, so use File.join
28f542b is described below

commit 28f542b2b3b31cf780a751cf262ea5717886679d
Author: Sebb <sebb@apache.org>
AuthorDate: Mon Jun 29 22:39:44 2020 +0100

    These are files, so use File.join
---
 www/board/agenda/routes.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/board/agenda/routes.rb b/www/board/agenda/routes.rb
index 8fe92cb..d507c3d 100755
--- a/www/board/agenda/routes.rb
+++ b/www/board/agenda/routes.rb
@@ -83,7 +83,7 @@ get '/missing' do
     # update in memory cache with a dummy agenda.  The only relevant
     # part of the agenda that matters for this operation is the list
     # of pmcs (@pmcs).
-    template = "#{ASF::SVN['foundation_board']}/templates/board_agenda.erb"
+    template = File.join(ASF::SVN['foundation_board'], 'templates', 'board_agenda.erb')
     @meeting = ASF::Board.nextMeeting
     agenda = @meeting.strftime('board_agenda_%Y_%m_%d.txt')
     @directors = ['TBD']
@@ -544,7 +544,7 @@ get '/new' do
     reject {|date| draft[date.strftime('%B %d, %Y')] == 'approved'}.
     sort
 
-  template = "#{ASF::SVN['foundation_board']}/templates/board_agenda.erb"
+  template = File.join(ASF::SVN['foundation_board'], 'templates', 'board_agenda.erb')
   @disabled = dir("board_agenda_*.txt").
     include? @meeting.strftime("board_agenda_%Y_%m_%d.txt")
   @agenda = Erubis::Eruby.new(IO.read(template)).result(binding)


Mime
View raw message