<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/22815">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">redmine: Make changeset keywords work with OS# annotation<br><br>In Osmocom we annotate osmocom issues as OS#1234 and not just as #1234,<br>in order to distinguish them from redmine or coverity issues.<br><br>Change-Id: I04a97434433a022f47a759a8219458e8772ae71e<br>Related: OS#5005, OS#3291<br>---<br>M redmine/Dockerfile<br>A redmine/commitlog-references-oshash.diff<br>2 files changed, 21 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/15/22815/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/redmine/Dockerfile b/redmine/Dockerfile</span><br><span>index 2dfb100..add01b3 100644</span><br><span>--- a/redmine/Dockerfile</span><br><span>+++ b/redmine/Dockerfile</span><br><span>@@ -11,3 +11,6 @@</span><br><span> # no longer needed after ruby-openid-2.9.2 is used</span><br><span> #ADD    hmac.diff /tmp/hmac.diff</span><br><span> #RUN        cd / && patch -p0 < /tmp/hmac.diff</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ADD    commitlog-references-oshash.diff /tmp/commitlog-references-oshash.diff</span><br><span style="color: hsl(120, 100%, 40%);">+RUN     cd /usr/src/redmine && patch -p1 < /tmp/commitlog-references-oshash.diff</span><br><span>diff --git a/redmine/commitlog-references-oshash.diff b/redmine/commitlog-references-oshash.diff</span><br><span>new file mode 100644</span><br><span>index 0000000..389ebe5</span><br><span>--- /dev/null</span><br><span>+++ b/redmine/commitlog-references-oshash.diff</span><br><span>@@ -0,0 +1,18 @@</span><br><span style="color: hsl(120, 100%, 40%);">+diff --git a/app/models/changeset.rb b/app/models/changeset.rb</span><br><span style="color: hsl(120, 100%, 40%);">+index 4256f0589..b5ef7b298 100644</span><br><span style="color: hsl(120, 100%, 40%);">+--- a/app/models/changeset.rb</span><br><span>++++ b/app/models/changeset.rb</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -126,11 +126,11 @@ class Changeset < ActiveRecord::Base</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+     referenced_issues = []</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+-    comments.scan(/([\s\(\[,-]|^)((#{kw_regexp})[\s:]+)?(#\d+(\s+@#{TIMELOG_RE})?([\s,;&]+#\d+(\s+@#{TIMELOG_RE})?)*)(?=[[:punct:]]|\s|<|$)/i) do |match|</span><br><span style="color: hsl(120, 100%, 40%);">++    comments.scan(/([\s\(\[,-]|^)((#{kw_regexp})[\s:]+)?(OS#\d+(\s+@#{TIMELOG_RE})?([\s,;&]+#\d+(\s+@#{TIMELOG_RE})?)*)(?=[[:punct:]]|\s|<|$)/i) do |match|</span><br><span style="color: hsl(120, 100%, 40%);">+       action, refs = match[2].to_s.downcase, match[3]</span><br><span style="color: hsl(120, 100%, 40%);">+       next unless action.present? || ref_keywords_any</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+-      refs.scan(/#(\d+)(\s+@#{TIMELOG_RE})?/).each do |m|</span><br><span style="color: hsl(120, 100%, 40%);">++      refs.scan(/OS#(\d+)(\s+@#{TIMELOG_RE})?/).each do |m|</span><br><span style="color: hsl(120, 100%, 40%);">+         issue, hours = find_referenced_issue_by_id(m[0].to_i), m[2]</span><br><span style="color: hsl(120, 100%, 40%);">+         if issue && !issue_linked_to_same_commit?(issue)</span><br><span style="color: hsl(120, 100%, 40%);">+           referenced_issues << issue</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/22815">change 22815</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/22815"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I04a97434433a022f47a759a8219458e8772ae71e </div>
<div style="display:none"> Gerrit-Change-Number: 22815 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>