Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
ee209cc9
Commit
ee209cc9
authored
Jan 25, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix rubocop new 2.2 syntax issues
parent
719b73b8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+1
-1
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+1
-1
spec/models/concerns/case_sensitivity_spec.rb
spec/models/concerns/case_sensitivity_spec.rb
+6
-6
No files found.
app/helpers/commits_helper.rb
View file @
ee209cc9
...
@@ -152,7 +152,7 @@ module CommitsHelper
...
@@ -152,7 +152,7 @@ module CommitsHelper
options
=
{
options
=
{
class:
"commit-
#{
options
[
:source
]
}
-link has_tooltip"
,
class:
"commit-
#{
options
[
:source
]
}
-link has_tooltip"
,
data:
{
:'original-title'
=>
sanitize
(
source_email
)
}
data:
{
'original-title'
:
sanitize
(
source_email
)
}
}
}
if
user
.
nil?
if
user
.
nil?
...
...
app/helpers/projects_helper.rb
View file @
ee209cc9
...
@@ -40,7 +40,7 @@ module ProjectsHelper
...
@@ -40,7 +40,7 @@ module ProjectsHelper
link_to
(
author_html
,
user_path
(
author
),
class:
"author_link"
).
html_safe
link_to
(
author_html
,
user_path
(
author
),
class:
"author_link"
).
html_safe
else
else
title
=
opts
[
:title
].
sub
(
":name"
,
sanitize
(
author
.
name
))
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'
:
title
,
container:
'body'
}
).
html_safe
end
end
end
end
...
...
spec/models/concerns/case_sensitivity_spec.rb
View file @
ee209cc9
...
@@ -37,7 +37,7 @@ describe CaseSensitivity, models: true do
...
@@ -37,7 +37,7 @@ describe CaseSensitivity, models: true do
with
(
%q{LOWER("foo"."bar") = LOWER(:value)}
,
value:
'bar'
).
with
(
%q{LOWER("foo"."bar") = LOWER(:value)}
,
value:
'bar'
).
and_return
(
criteria
)
and_return
(
criteria
)
expect
(
model
.
iwhere
(
:'foo.bar'
=>
'bar'
)).
to
eq
(
criteria
)
expect
(
model
.
iwhere
(
'foo.bar'
:
'bar'
)).
to
eq
(
criteria
)
end
end
end
end
...
@@ -87,8 +87,8 @@ describe CaseSensitivity, models: true do
...
@@ -87,8 +87,8 @@ describe CaseSensitivity, models: true do
with
(
%q{LOWER("foo"."baz") = LOWER(:value)}
,
value:
'baz'
).
with
(
%q{LOWER("foo"."baz") = LOWER(:value)}
,
value:
'baz'
).
and_return
(
final
)
and_return
(
final
)
got
=
model
.
iwhere
(
:'foo.bar'
=>
'bar'
,
got
=
model
.
iwhere
(
'foo.bar'
:
'bar'
,
:'foo.baz'
=>
'baz'
)
'foo.baz'
:
'baz'
)
expect
(
got
).
to
eq
(
final
)
expect
(
got
).
to
eq
(
final
)
end
end
...
@@ -127,7 +127,7 @@ describe CaseSensitivity, models: true do
...
@@ -127,7 +127,7 @@ describe CaseSensitivity, models: true do
with
(
%q{`foo`.`bar` = :value}
,
value:
'bar'
).
with
(
%q{`foo`.`bar` = :value}
,
value:
'bar'
).
and_return
(
criteria
)
and_return
(
criteria
)
expect
(
model
.
iwhere
(
:'foo.bar'
=>
'bar'
)).
expect
(
model
.
iwhere
(
'foo.bar'
:
'bar'
)).
to
eq
(
criteria
)
to
eq
(
criteria
)
end
end
end
end
...
@@ -178,8 +178,8 @@ describe CaseSensitivity, models: true do
...
@@ -178,8 +178,8 @@ describe CaseSensitivity, models: true do
with
(
%q{`foo`.`baz` = :value}
,
value:
'baz'
).
with
(
%q{`foo`.`baz` = :value}
,
value:
'baz'
).
and_return
(
final
)
and_return
(
final
)
got
=
model
.
iwhere
(
:'foo.bar'
=>
'bar'
,
got
=
model
.
iwhere
(
'foo.bar'
:
'bar'
,
:'foo.baz'
=>
'baz'
)
'foo.baz'
:
'baz'
)
expect
(
got
).
to
eq
(
final
)
expect
(
got
).
to
eq
(
final
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment