Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
Commits
902baa2e
Commit
902baa2e
authored
Jan 28, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
trick rubocop and temporarily add ruby 2.1 images for any branch
parent
ca171b81
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
12 deletions
+14
-12
.gitlab-ci.yml
.gitlab-ci.yml
+6
-4
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.
.gitlab-ci.yml
View file @
902baa2e
...
...
@@ -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
app/helpers/commits_helper.rb
View file @
902baa2e
...
...
@@ -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?
...
...
app/helpers/projects_helper.rb
View file @
902baa2e
...
...
@@ -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
...
...
spec/models/concerns/case_sensitivity_spec.rb
View file @
902baa2e
...
...
@@ -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
...
...
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