summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-05-11 08:59:44 +0000
committerRémy Coutable <remy@rymai.me>2016-05-11 08:59:44 +0000
commite77a9a342e175c7274350ef6d655bde496eca778 (patch)
tree0eb8e88db37a165b9098960caa32d0cf09ba52f1 /lib
parentde5ae1bf0604c9d250145e2c6aeaa0adfdc760bf (diff)
parent377583a361988d9884808a3c3f5375497a9d5b56 (diff)
downloadgitlab-ce-e77a9a342e175c7274350ef6d655bde496eca778.tar.gz
Merge branch 'casecmp-cop' into 'master'
Enable Rubocop Casecmp Performance Cop. Also fixes the errors caused by enabling the cop. `casecmp` is more performant than `.downcase` and `==`. See also: https://github.com/bbatsov/rubocop/blob/master/lib/rubocop/cop/performance/casecmp.rb See merge request !3957
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/database.rb4
-rw-r--r--lib/gitlab/markup_helper.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb
index 6f9da69983a..42bec913a45 100644
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
@@ -5,11 +5,11 @@ module Gitlab
end
def self.mysql?
- adapter_name.downcase == 'mysql2'
+ adapter_name.casecmp('mysql2').zero?
end
def self.postgresql?
- adapter_name.downcase == 'postgresql'
+ adapter_name.casecmp('postgresql').zero?
end
def self.version
diff --git a/lib/gitlab/markup_helper.rb b/lib/gitlab/markup_helper.rb
index a5f767b134d..dda371e6554 100644
--- a/lib/gitlab/markup_helper.rb
+++ b/lib/gitlab/markup_helper.rb
@@ -40,7 +40,7 @@ module Gitlab
# Returns boolean
def plain?(filename)
filename.downcase.end_with?('.txt') ||
- filename.downcase == 'readme'
+ filename.casecmp('readme').zero?
end
def previewable?(filename)