aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlec Warner <antarus@gentoo.org>2018-04-28 14:15:15 -0400
committerAlec Warner <antarus@gentoo.org>2018-04-28 14:15:15 -0400
commita25edeeaa6d22dba13e7a4e0e26f5945b1f23776 (patch)
treebb347ae439b23d081b89cfe17727b9ce9fe2d634
parentUpdate Gems. (diff)
downloadpackages-a25edeeaa6d22dba13e7a4e0e26f5945b1f23776.tar.gz
packages-a25edeeaa6d22dba13e7a4e0e26f5945b1f23776.tar.bz2
packages-a25edeeaa6d22dba13e7a4e0e26f5945b1f23776.zip
Only Test ruby 2.2
Comment out busted packages_helper code to assist in tests passing.
-rw-r--r--.travis.yml1
-rw-r--r--app/helpers/packages_helper.rb16
-rw-r--r--app/views/packages/_changelog_entry.html.erb2
3 files changed, 9 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index 3adfbdb..7c37712 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
language: ruby
rvm:
- - 2.2.9
- 2.2
diff --git a/app/helpers/packages_helper.rb b/app/helpers/packages_helper.rb
index 5f81a4c..ee83a2e 100644
--- a/app/helpers/packages_helper.rb
+++ b/app/helpers/packages_helper.rb
@@ -32,14 +32,14 @@ module PackagesHelper
# This parses commit messages for GLEP66 style bug annotations.
# Bug: https://bugs.gentoo.org/NNNNNN
# Closes: https://bugs.gentoo.org/NNNNNN
- def glep66_bugs(commit_msg)
- bugs_list = []
- commit_msg.each_line do |line| {
- bugno = line[/(Bug\:|Closes\:)\s+https:\/\/bugs\.gentoo\.org\/(\d+)/, 1]
- bugs_list << "https://bugs.gentoo.org/#{bugno}" if !bugno.nil?
- }
- bugs_list
- end
+ #def glep66_bugs(commit_msg)
+ # bugs_list = []
+ # commit_msg.each_line do |line| {
+ # bugno = line[/(Bug\:|Closes\:)\s+https:\/\/bugs\.gentoo\.org\/(\d+)/, 1]
+ # bugs_list << "https://bugs.gentoo.org/#{bugno}" if !bugno.nil?
+ # }
+ # bugs_list
+ #end
def annotate_bugs(str)
annotated_str = str.gsub(/([bB]ug\s+|[bB]ug\s+#|#)(\d+)/) do
diff --git a/app/views/packages/_changelog_entry.html.erb b/app/views/packages/_changelog_entry.html.erb
index f2bdf72..eeaa17f 100644
--- a/app/views/packages/_changelog_entry.html.erb
+++ b/app/views/packages/_changelog_entry.html.erb
@@ -1,7 +1,7 @@
<li class="list-group-item">
<strong><%= annotate_bugs changelog[:message].lines.first %></strong>
<br>
- Bugs: <%= safe_join(glep66_bugs(changelog[:message].lines[1..-1]).each {|l| annotate_bugs l}, ',') %>
+ <!-- Bugs: <%= safe_join(glep66_bugs(changelog[:message].lines[1..-1]).each {|l| annotate_bugs l}, ',') %> -->
<br>
<div class="kk-byline">
<%= mail_to changelog[:email], changelog[:author] %>,