From cd688a60111853f63413a87ad6632ad57368e886 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Sun, 19 Oct 2014 16:09:38 +0200
Subject: Replace regex methods by string ones since faster

and more readable.
---
 app/models/commit.rb                            | 8 ++++----
 app/models/project_services/campfire_service.rb | 4 ++--
 app/models/project_services/hipchat_service.rb  | 4 ++--
 app/models/project_services/pushover_service.rb | 4 ++--
 app/models/project_services/slack_message.rb    | 4 ++--
 app/models/user.rb                              | 2 +-
 app/services/git_push_service.rb                | 8 ++++----
 app/services/notification_service.rb            | 2 +-
 lib/api/internal.rb                             | 4 ++--
 lib/tasks/gitlab/import.rake                    | 2 +-
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/models/commit.rb b/app/models/commit.rb
index 37dd371ec00..baccf286740 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] << "&hellip;".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)
                     "&hellip;".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 0736ddab99b..3116c311052 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 a848d74044c..5645a15b144 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 <a href=\""\
                  "#{project.web_url}/commits/#{URI.escape(ref)}\">#{ref}</a>"\
                  " to <a href=\"#{project.web_url}\">"\
                  "#{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"
     else
       message << "pushed to branch <a href=\""\
diff --git a/app/models/project_services/pushover_service.rb b/app/models/project_services/pushover_service.rb
index f247fde7762..a9b23f97ba0 100644
--- a/app/models/project_services/pushover_service.rb
+++ b/app/models/project_services/pushover_service.rb
@@ -80,9 +80,9 @@ class PushoverService < Service
     before = push_data[:before]
     after = push_data[:after]
 
-    if before =~ /000000/
+    if before.include?('000000')
       message = "#{push_data[:user_name]} pushed new branch \"#{ref}\"."
-    elsif after =~ /000000/
+    elsif after.include?('000000')
       message = "#{push_data[:user_name]} deleted branch \"#{ref}\"."
     else
       message = "#{push_data[:user_name]} push to branch \"#{ref}\"."
diff --git a/app/models/project_services/slack_message.rb b/app/models/project_services/slack_message.rb
index 28204e5ea60..4122a3c4fc5 100644
--- a/app/models/project_services/slack_message.rb
+++ b/app/models/project_services/slack_message.rb
@@ -77,11 +77,11 @@ class SlackMessage
   end
 
   def new_branch?
-    before =~ /000000/
+    before.include?('000000')
   end
 
   def removed_branch?
-    after =~ /000000/
+    after.include?('000000')
   end
 
   def branch_url
diff --git a/app/models/user.rb b/app/models/user.rb
index 7dae318e780..a2d3b99ded1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -487,7 +487,7 @@ class User < ActiveRecord::Base
   end
 
   def temp_oauth_email?
-    email =~ /\Atemp-email-for-oauth/
+    email.start_with?('temp-email-for-oauth')
   end
 
   def public_profile?
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index 529af1970f6..91c91fb31e7 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -170,23 +170,23 @@ class GitPushService
     ref_parts = ref.split('/')
 
     # 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
 
   def push_to_new_branch?(ref, oldrev)
     ref_parts = ref.split('/')
 
-    ref_parts[1] =~ /heads/ && oldrev == Gitlab::Git::BLANK_SHA
+    ref_parts[1].include?('heads') && oldrev == Gitlab::Git::BLANK_SHA
   end
 
   def push_remove_branch?(ref, newrev)
     ref_parts = ref.split('/')
 
-    ref_parts[1] =~ /heads/ && newrev == Gitlab::Git::BLANK_SHA
+    ref_parts[1].include?('heads') && newrev == Gitlab::Git::BLANK_SHA
   end
 
   def push_to_branch?(ref)
-    ref =~ /refs\/heads/
+    ref.include?('refs/heads')
   end
 
   def is_default_branch?(ref)
diff --git a/app/services/notification_service.rb b/app/services/notification_service.rb
index d1aadd741e1..b4babec7348 100644
--- a/app/services/notification_service.rb
+++ b/app/services/notification_service.rb
@@ -118,7 +118,7 @@ class NotificationService
     return true unless note.noteable_type.present?
 
     # 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
 
     opts = { noteable_type: note.noteable_type, project_id: note.project_id }
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 180e50611cf..a999cff09c0 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -25,8 +25,8 @@ module API
         # project. This applies the correct project permissions to
         # the wiki repository as well.
         access =
-          if project_path =~ /\.wiki\Z/
-            project_path.sub!(/\.wiki\Z/, '')
+          if project_path.end_with?('.wiki')
+            project_path.chomp!('.wiki')
             Gitlab::GitAccessWiki.new
           else
             Gitlab::GitAccess.new
diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake
index 3c693546c09..fef2afd7333 100644
--- a/lib/tasks/gitlab/import.rake
+++ b/lib/tasks/gitlab/import.rake
@@ -25,7 +25,7 @@ namespace :gitlab do
 
         puts "Processing #{repo_path}".yellow
 
-        if path =~ /\.wiki\Z/
+        if path.end_with?('.wiki')
           puts " * Skipping wiki repo"
           next
         end
-- 
cgit v1.2.1