Browse Source

Use match? instead of =~ when MatchData is not used (#34150).

Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@20168 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.2.0
Go MAEDA 3 years ago
parent
commit
fdba424d77

+ 1
- 1
app/models/issue_import.rb View File

else else
add_callback(parent_issue_id, 'set_as_parent', item.position) add_callback(parent_issue_id, 'set_as_parent', item.position)
end end
elsif parent_issue_id =~ /\A\d+\z/
elsif /\A\d+\z/.match?(parent_issue_id)
# refers to other row by position # refers to other row by position
parent_issue_id = parent_issue_id.to_i parent_issue_id = parent_issue_id.to_i



+ 1
- 1
app/models/setting.rb View File

if settings.key?(:mail_from) if settings.key?(:mail_from)
begin begin
mail_from = Mail::Address.new(settings[:mail_from]) mail_from = Mail::Address.new(settings[:mail_from])
raise unless mail_from.address =~ EmailAddress::EMAIL_REGEXP
raise unless EmailAddress::EMAIL_REGEXP.match?(mail_from.address)
rescue rescue
messages << [:mail_from, l('activerecord.errors.messages.invalid')] messages << [:mail_from, l('activerecord.errors.messages.invalid')]
end end

+ 1
- 1
db/migrate/20120422150750_change_repositories_to_full_sti.rb View File

Repository.connection. Repository.connection.
select_rows("SELECT id, type FROM #{Repository.table_name}"). select_rows("SELECT id, type FROM #{Repository.table_name}").
each do |repository_id, repository_type| each do |repository_id, repository_type|
unless repository_type =~ /^Repository::/
unless /^Repository::/.match?(repository_type)
Repository.where(["id = ?", repository_id]). Repository.where(["id = ?", repository_id]).
update_all(["type = ?", "Repository::#{repository_type}"]) update_all(["type = ?", "Repository::#{repository_type}"])
end end

+ 2
- 2
db/migrate/20180923082945_change_sqlite_booleans_to_0_and_1.rb View File

} }


def up def up
if ActiveRecord::Base.connection.adapter_name =~ /sqlite/i
if /sqlite/i.match?(ActiveRecord::Base.connection.adapter_name)
COLUMNS.each do |klass, columns| COLUMNS.each do |klass, columns|
columns.each do |column| columns.each do |column|
klass.where("#{column} = 't'").update_all(column => 1) klass.where("#{column} = 't'").update_all(column => 1)
end end


def down def down
if ActiveRecord::Base.connection.adapter_name =~ /sqlite/i
if /sqlite/i.match?(ActiveRecord::Base.connection.adapter_name)
COLUMNS.each do |klass, columns| COLUMNS.each do |klass, columns|
columns.each do |column| columns.each do |column|
klass.where("#{column} = 1").update_all(column => 't') klass.where("#{column} = 1").update_all(column => 't')

+ 2
- 2
db/migrate/20180923091603_change_sqlite_booleans_default.rb View File

} }


def up def up
if ActiveRecord::Base.connection.adapter_name =~ /sqlite/i
if /sqlite/i.match?(ActiveRecord::Base.connection.adapter_name)
DEFAULTS.each do |table, defaults| DEFAULTS.each do |table, defaults|
defaults.each do |column, value| defaults.each do |column, value|
# Reset default values for boolean column (t/f => 1/0) # Reset default values for boolean column (t/f => 1/0)
end end


def down def down
if ActiveRecord::Base.connection.adapter_name =~ /sqlite/i
if /sqlite/i.match?(ActiveRecord::Base.connection.adapter_name)
# Cannot restore default values as t/f # Cannot restore default values as t/f
raise ActiveRecord::IrreversibleMigration raise ActiveRecord::IrreversibleMigration
end end

+ 2
- 2
lib/redmine/scm/adapters/bazaar_adapter.rb View File

revision = nil revision = nil
parsing = nil parsing = nil
io.each_line do |line| io.each_line do |line|
if line =~ /^----/
if /^----/.match?(line)
revisions << revision if revision revisions << revision if revision
revision = Revision.new(:paths => [], :message => '') revision = Revision.new(:paths => [], :message => '')
parsing = nil parsing = nil
revision.scmid = $1.strip revision.scmid = $1.strip
elsif line =~ /^timestamp: (.+)$/ elsif line =~ /^timestamp: (.+)$/
revision.time = Time.parse($1).localtime revision.time = Time.parse($1).localtime
elsif line =~ /^ -----/
elsif /^ -----/.match?(line)
# partial revisions # partial revisions
parsing = nil unless parsing == 'message' parsing = nil unless parsing == 'message'
elsif line =~ /^(message|added|modified|removed|renamed):/ elsif line =~ /^(message|added|modified|removed|renamed):/

+ 5
- 5
lib/redmine/scm/adapters/cvs_adapter.rb View File

next next
end end
elsif state == "tags" elsif state == "tags"
if /^#{STARTLOG}/ =~ line
if /^#{STARTLOG}/.match?(line)
commit_log = "" commit_log = ""
state = "revision" state = "revision"
elsif /^#{ENDLOG}/ =~ line
elsif /^#{ENDLOG}/.match?(line)
state = "head" state = "head"
end end
next next
end end
commit_log = "" commit_log = ""
revision = nil revision = nil
if /^#{ENDLOG}/ =~ line
if /^#{ENDLOG}/.match?(line)
state = "entry_start" state = "entry_start"
end end
next next
end end


if /^branches: (.+)$/ =~ line
if /^branches: (.+)$/.match?(line)
# TODO: version.branch = $1 # TODO: version.branch = $1
elsif /^revision (\d+(?:\.\d+)+).*$/ =~ line elsif /^revision (\d+(?:\.\d+)+).*$/ =~ line
revision = $1 revision = $1
# version.line_minus = 0 # version.line_minus = 0
# end # end
else else
commit_log += line unless line =~ /^\*\*\* empty log message \*\*\*/
commit_log += line unless /^\*\*\* empty log message \*\*\*/.match?(line)
end end
end end
end end

+ 4
- 4
lib/redmine/wiki_formatting/textile/redcloth3.rb View File

end end


def lT( text ) def lT( text )
text =~ /\#$/ ? 'o' : 'u'
/\#$/.match?(text) ? 'o' : 'u'
end end


def hard_break( text ) def hard_break( text )


def refs( text ) def refs( text )
@rules.each do |rule_name| @rules.each do |rule_name|
method( rule_name ).call( text ) if rule_name.to_s.match /^refs_/
method( rule_name ).call( text ) if rule_name.to_s.match? /^refs_/
end end
end end


text.gsub!( ALLTAG_MATCH ) do |line| text.gsub!( ALLTAG_MATCH ) do |line|
## matches are off if we're between <code>, <pre> etc. ## matches are off if we're between <code>, <pre> etc.
if $1 if $1
if line =~ OFFTAG_OPEN
if OFFTAG_OPEN.match?(line)
codepre += 1 codepre += 1
elsif line =~ OFFTAG_CLOSE
elsif OFFTAG_CLOSE.match?(line)
codepre -= 1 codepre -= 1
codepre = 0 if codepre < 0 codepre = 0 if codepre < 0
end end

Loading…
Cancel
Save