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: More messages to allow
Date Mon, 05 Jun 2017 10:12:38 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 72ebd35  More messages to allow
72ebd35 is described below

commit 72ebd35ba1aac318f44feb11d693e84fc83c6a70
Author: Sebb <sebb@apache.org>
AuthorDate: Mon Jun 5 11:12:25 2017 +0100

    More messages to allow
---
 www/status/monitors/git.rb | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/www/status/monitors/git.rb b/www/status/monitors/git.rb
index 766b90f..e158f6b 100644
--- a/www/status/monitors/git.rb
+++ b/www/status/monitors/git.rb
@@ -58,7 +58,8 @@ def Monitor.git(previous_status)
       
     lines.reject! do |line| 
       line.start_with?(*start_ignores) or
-      line =~ /^ \d+ files changed, \d+ insertions\(\+\), \d+ deletions\(-\)$/
+      line =~ /^ \d+ files? changed, \d+ insertions\(\+\), \d+ deletions\(-\)$/ or
+      line =~  /^ +[0-9a-f]+\.\.[0-9a-f]+ +\S+ -> \S+$/ # branch
     end
 
     unless lines.empty?
@@ -67,7 +68,7 @@ def Monitor.git(previous_status)
     end
 
     # Drop the individual file details
-    lines.reject! {|line| line =~  /^ \S+ +\| [ \d]\d /}
+    lines.reject! {|line| line =~  /^ \S+ +\| [ \d]\d+ /}
 
     show 'lines', lines
     if lines.empty?
@@ -152,5 +153,15 @@ From git://git.apache.org/infrastructure-puppet
  * [new branch]      humbedooh/multimail-1.5 -> origin/humbedooh/multimail-1.5
 Already up-to-date.
 
+/x1/srv/git/infrastructure-puppet4
+Already on 'deployment'
+Your branch is up-to-date with 'origin/deployment'.
+From git://git.apache.org/infrastructure-puppet
+   83e4220..7394a6e  deployment -> origin/deployment
+Updating 83e4220..7394a6e
+Fast-forward
+ modules/gitbox/files/asfgit/git_multimail.py | 1009 +++++++++++++++++++-------
+ 1 file changed, 737 insertions(+), 272 deletions(-)
+
 /x1/srv/git/letsencrypt
 Already up-to-date.

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].

Mime
View raw message