Skip to content
Snippets Groups Projects
Commit 902baa2e authored by James Lopez's avatar James Lopez
Browse files

trick rubocop and temporarily add ruby 2.1 images for any branch

parent ca171b81
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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
Loading
Loading
@@ -155,5 +156,6 @@ spinach:ruby21:
tags:
- ruby
- mysql
only:
- master
# TODO: put this back after testing
# only:
# - master
Loading
Loading
@@ -152,7 +152,7 @@ module CommitsHelper
 
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?
Loading
Loading
Loading
Loading
@@ -40,7 +40,7 @@ module ProjectsHelper
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
 
Loading
Loading
Loading
Loading
@@ -37,7 +37,7 @@ describe CaseSensitivity, models: true do
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
 
Loading
Loading
@@ -87,8 +87,8 @@ describe CaseSensitivity, models: true do
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
Loading
Loading
@@ -127,7 +127,7 @@ describe CaseSensitivity, models: true do
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
Loading
Loading
@@ -178,8 +178,8 @@ describe CaseSensitivity, models: true do
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
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment