Commit c5ba87a2 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #8096 from cirosantilli/regex-to-string

Replace regex methods by string ones since faster and more readable
parents 9c4015f3 cd688a60
...@@ -75,11 +75,11 @@ class Commit ...@@ -75,11 +75,11 @@ class Commit
return no_commit_message if title.blank? 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) if (!title_end && title.length > 100) || (title_end && title_end > 100)
title[0..79] << "&hellip;".html_safe title[0..79] << "&hellip;".html_safe
else else
title.split(/\n/, 2).first title.split("\n", 2).first
end end
end end
...@@ -87,11 +87,11 @@ class Commit ...@@ -87,11 +87,11 @@ class Commit
# #
# cut off, ellipses (`&hellp;`) are prepended to the commit message. # cut off, ellipses (`&hellp;`) are prepended to the commit message.
def description 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) @description ||= if (!title_end && safe_message.length > 100) || (title_end && title_end > 100)
"&hellip;".html_safe << safe_message[80..-1] "&hellip;".html_safe << safe_message[80..-1]
else else
safe_message.split(/\n/, 2)[1].try(:chomp) safe_message.split("\n", 2)[1].try(:chomp)
end end
end end
......
...@@ -60,9 +60,9 @@ class CampfireService < Service ...@@ -60,9 +60,9 @@ class CampfireService < Service
message << "[#{project.name_with_namespace}] " message << "[#{project.name_with_namespace}] "
message << "#{push[:user_name]} " message << "#{push[:user_name]} "
if before =~ /000000/ if before.include?('000000')
message << "pushed new branch #{ref} \n" message << "pushed new branch #{ref} \n"
elsif after =~ /000000/ elsif after.include?('000000')
message << "removed branch #{ref} \n" message << "removed branch #{ref} \n"
else else
message << "pushed #{push[:total_commits_count]} commits to #{ref}. " message << "pushed #{push[:total_commits_count]} commits to #{ref}. "
......
...@@ -58,12 +58,12 @@ class HipchatService < Service ...@@ -58,12 +58,12 @@ class HipchatService < Service
message = "" message = ""
message << "#{push[:user_name]} " message << "#{push[:user_name]} "
if before =~ /000000/ if before.include?('000000')
message << "pushed new branch <a href=\""\ message << "pushed new branch <a href=\""\
"#{project.web_url}/commits/#{URI.escape(ref)}\">#{ref}</a>"\ "#{project.web_url}/commits/#{URI.escape(ref)}\">#{ref}</a>"\
" to <a href=\"#{project.web_url}\">"\ " to <a href=\"#{project.web_url}\">"\
"#{project.name_with_namespace.gsub!(/\s/, "")}</a>\n" "#{project.name_with_namespace.gsub!(/\s/, "")}</a>\n"
elsif after =~ /000000/ elsif after.include?('000000')
message << "removed branch #{ref} from <a href=\"#{project.web_url}\">#{project.name_with_namespace.gsub!(/\s/,'')}</a> \n" message << "removed branch #{ref} from <a href=\"#{project.web_url}\">#{project.name_with_namespace.gsub!(/\s/,'')}</a> \n"
else else
message << "pushed to branch <a href=\""\ message << "pushed to branch <a href=\""\
......
...@@ -80,9 +80,9 @@ class PushoverService < Service ...@@ -80,9 +80,9 @@ class PushoverService < Service
before = push_data[:before] before = push_data[:before]
after = push_data[:after] after = push_data[:after]
if before =~ /000000/ if before.include?('000000')
message = "#{push_data[:user_name]} pushed new branch \"#{ref}\"." message = "#{push_data[:user_name]} pushed new branch \"#{ref}\"."
elsif after =~ /000000/ elsif after.include?('000000')
message = "#{push_data[:user_name]} deleted branch \"#{ref}\"." message = "#{push_data[:user_name]} deleted branch \"#{ref}\"."
else else
message = "#{push_data[:user_name]} push to branch \"#{ref}\"." message = "#{push_data[:user_name]} push to branch \"#{ref}\"."
......
...@@ -77,11 +77,11 @@ class SlackMessage ...@@ -77,11 +77,11 @@ class SlackMessage
end end
def new_branch? def new_branch?
before =~ /000000/ before.include?('000000')
end end
def removed_branch? def removed_branch?
after =~ /000000/ after.include?('000000')
end end
def branch_url def branch_url
......
...@@ -488,7 +488,7 @@ class User < ActiveRecord::Base ...@@ -488,7 +488,7 @@ class User < ActiveRecord::Base
end end
def temp_oauth_email? def temp_oauth_email?
email =~ /\Atemp-email-for-oauth/ email.start_with?('temp-email-for-oauth')
end end
def public_profile? def public_profile?
......
...@@ -111,23 +111,23 @@ class GitPushService ...@@ -111,23 +111,23 @@ class GitPushService
ref_parts = ref.split('/') ref_parts = ref.split('/')
# Return if this is not a push to a branch (e.g. new commits) # Return if this is not a push to a branch (e.g. new commits)
ref_parts[1] =~ /heads/ && oldrev != Gitlab::Git::BLANK_SHA ref_parts[1].include?('heads') && oldrev != Gitlab::Git::BLANK_SHA
end end
def push_to_new_branch?(ref, oldrev) def push_to_new_branch?(ref, oldrev)
ref_parts = ref.split('/') ref_parts = ref.split('/')
ref_parts[1] =~ /heads/ && oldrev == Gitlab::Git::BLANK_SHA ref_parts[1].include?('heads') && oldrev == Gitlab::Git::BLANK_SHA
end end
def push_remove_branch?(ref, newrev) def push_remove_branch?(ref, newrev)
ref_parts = ref.split('/') ref_parts = ref.split('/')
ref_parts[1] =~ /heads/ && newrev == Gitlab::Git::BLANK_SHA ref_parts[1].include?('heads') && newrev == Gitlab::Git::BLANK_SHA
end end
def push_to_branch?(ref) def push_to_branch?(ref)
ref =~ /refs\/heads/ ref.include?('refs/heads')
end end
def is_default_branch?(ref) def is_default_branch?(ref)
......
...@@ -118,7 +118,7 @@ class NotificationService ...@@ -118,7 +118,7 @@ class NotificationService
return true unless note.noteable_type.present? return true unless note.noteable_type.present?
# ignore gitlab service messages # ignore gitlab service messages
return true if note.note =~ /\A_Status changed to closed_/ return true if note.note.start_with?('_Status changed to closed_')
return true if note.cross_reference? && note.system == true return true if note.cross_reference? && note.system == true
opts = { noteable_type: note.noteable_type, project_id: note.project_id } opts = { noteable_type: note.noteable_type, project_id: note.project_id }
......
...@@ -25,8 +25,8 @@ module API ...@@ -25,8 +25,8 @@ module API
# project. This applies the correct project permissions to # project. This applies the correct project permissions to
# the wiki repository as well. # the wiki repository as well.
access = access =
if project_path =~ /\.wiki\Z/ if project_path.end_with?('.wiki')
project_path.sub!(/\.wiki\Z/, '') project_path.chomp!('.wiki')
Gitlab::GitAccessWiki.new Gitlab::GitAccessWiki.new
else else
Gitlab::GitAccess.new Gitlab::GitAccess.new
......
...@@ -25,7 +25,7 @@ namespace :gitlab do ...@@ -25,7 +25,7 @@ namespace :gitlab do
puts "Processing #{repo_path}".yellow puts "Processing #{repo_path}".yellow
if path =~ /\.wiki\Z/ if path.end_with?('.wiki')
puts " * Skipping wiki repo" puts " * Skipping wiki repo"
next next
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment