Commit 902baa2e authored by James Lopez's avatar James Lopez

trick rubocop and temporarily add ruby 2.1 images for any branch

parent ca171b81
......@@ -145,8 +145,9 @@ spec:ruby21:
tags:
- ruby
- mysql
only:
- master
# TODO: put this back after testing
# only:
# - master
spinach:ruby21:
image: ruby:2.1
......@@ -155,5 +156,6 @@ spinach:ruby21:
tags:
- ruby
- mysql
only:
- master
# TODO: put this back after testing
# only:
# - master
......@@ -152,7 +152,7 @@ def commit_person_link(commit, options = {})
options = {
class: "commit-#{options[:source]}-link has_tooltip",
data: { 'original-title': sanitize(source_email) }
data: { 'original-title'.to_sym => sanitize(source_email) }
}
if user.nil?
......
......@@ -40,7 +40,7 @@ def link_to_member(project, author, opts = {})
link_to(author_html, user_path(author), class: "author_link").html_safe
else
title = opts[:title].sub(":name", sanitize(author.name))
link_to(author_html, user_path(author), class: "author_link has_tooltip", data: { 'original-title': title, container: 'body' } ).html_safe
link_to(author_html, user_path(author), class: "author_link has_tooltip", data: { 'original-title'.to_sym => title, container: 'body' } ).html_safe
end
end
......
......@@ -37,7 +37,7 @@
with(%q{LOWER("foo"."bar") = LOWER(:value)}, value: 'bar').
and_return(criteria)
expect(model.iwhere('foo.bar': 'bar')).to eq(criteria)
expect(model.iwhere('foo.bar'.to_sym => 'bar')).to eq(criteria)
end
end
......@@ -87,8 +87,8 @@
with(%q{LOWER("foo"."baz") = LOWER(:value)}, value: 'baz').
and_return(final)
got = model.iwhere('foo.bar': 'bar',
'foo.baz': 'baz')
got = model.iwhere('foo.bar'.to_sym => 'bar',
'foo.baz'.to_sym => 'baz')
expect(got).to eq(final)
end
......@@ -127,7 +127,7 @@
with(%q{`foo`.`bar` = :value}, value: 'bar').
and_return(criteria)
expect(model.iwhere('foo.bar': 'bar')).
expect(model.iwhere('foo.bar'.to_sym => 'bar')).
to eq(criteria)
end
end
......@@ -178,8 +178,8 @@
with(%q{`foo`.`baz` = :value}, value: 'baz').
and_return(final)
got = model.iwhere('foo.bar': 'bar',
'foo.baz': 'baz')
got = model.iwhere('foo.bar'.to_sym => 'bar',
'foo.baz'.to_sym => 'baz')
expect(got).to eq(final)
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