diff --git a/app/models/commit.rb b/app/models/commit.rb
index 37dd371ec0000c2fb3b5e3152142eb71b0838e11..baccf28674012b7675fde49d5bba149642cf6325 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -75,11 +75,11 @@ class Commit
return no_commit_message if title.blank?
- title_end = title.index(/\n/)
+ title_end = title.index("\n")
if (!title_end && title.length > 100) || (title_end && title_end > 100)
title[0..79] << "…".html_safe
else
- title.split(/\n/, 2).first
+ title.split("\n", 2).first
end
end
@@ -87,11 +87,11 @@ class Commit
#
# cut off, ellipses (`&hellp;`) are prepended to the commit message.
def description
- title_end = safe_message.index(/\n/)
+ title_end = safe_message.index("\n")
@description ||= if (!title_end && safe_message.length > 100) || (title_end && title_end > 100)
"…".html_safe << safe_message[80..-1]
else
- safe_message.split(/\n/, 2)[1].try(:chomp)
+ safe_message.split("\n", 2)[1].try(:chomp)
end
end
diff --git a/app/models/project_services/campfire_service.rb b/app/models/project_services/campfire_service.rb
index 0736ddab99bfa29c943d0674f06b70f3252063c1..3116c311052c28d2b041ba0d7187b8342042515f 100644
--- a/app/models/project_services/campfire_service.rb
+++ b/app/models/project_services/campfire_service.rb
@@ -60,9 +60,9 @@ class CampfireService < Service
message << "[#{project.name_with_namespace}] "
message << "#{push[:user_name]} "
- if before =~ /000000/
+ if before.include?('000000')
message << "pushed new branch #{ref} \n"
- elsif after =~ /000000/
+ elsif after.include?('000000')
message << "removed branch #{ref} \n"
else
message << "pushed #{push[:total_commits_count]} commits to #{ref}. "
diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb
index a848d74044cb05ca8eba8aa0ea2722fd4da4814a..5645a15b144c34b4431851715032f47d39c66021 100644
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
@@ -58,12 +58,12 @@ class HipchatService < Service
message = ""
message << "#{push[:user_name]} "
- if before =~ /000000/
+ if before.include?('000000')
message << "pushed new branch #{ref}"\
" to "\
"#{project.name_with_namespace.gsub!(/\s/, "")}\n"
- elsif after =~ /000000/
+ elsif after.include?('000000')
message << "removed branch #{ref} from #{project.name_with_namespace.gsub!(/\s/,'')} \n"
else
message << "pushed to branch