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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
3ba72f69
Commit
3ba72f69
authored
May 23, 2016
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable Style/SpaceAroundKeyword cop and fix offenses
parent
68b8e86a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
9 deletions
+7
-9
.rubocop.yml
.rubocop.yml
+1
-2
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+1
-2
lib/ci/ansi2html.rb
lib/ci/ansi2html.rb
+1
-1
spec/controllers/projects/group_links_controller_spec.rb
spec/controllers/projects/group_links_controller_spec.rb
+1
-1
spec/factories_spec.rb
spec/factories_spec.rb
+1
-1
spec/models/concerns/token_authenticatable_spec.rb
spec/models/concerns/token_authenticatable_spec.rb
+1
-1
spec/services/issues/create_service_spec.rb
spec/services/issues/create_service_spec.rb
+1
-1
No files found.
.rubocop.yml
View file @
3ba72f69
...
@@ -525,10 +525,9 @@ Style/SpaceAfterSemicolon:
...
@@ -525,10 +525,9 @@ Style/SpaceAfterSemicolon:
Style/SpaceAroundEqualsInParameterDefault
:
Style/SpaceAroundEqualsInParameterDefault
:
Enabled
:
false
Enabled
:
false
# TODO: Enable SpaceAroundKeyword Cop.
# Use a space around keywords if appropriate.
# Use a space around keywords if appropriate.
Style/SpaceAroundKeyword
:
Style/SpaceAroundKeyword
:
Enabled
:
fals
e
Enabled
:
tru
e
# Use a single space around operators.
# Use a single space around operators.
Style/SpaceAroundOperators
:
Style/SpaceAroundOperators
:
...
...
app/helpers/application_helper.rb
View file @
3ba72f69
...
@@ -110,8 +110,7 @@ module ApplicationHelper
...
@@ -110,8 +110,7 @@ module ApplicationHelper
]
]
# If reference is commit id - we should add it to branch/tag selectbox
# If reference is commit id - we should add it to branch/tag selectbox
if
(
@ref
&&
!
options
.
flatten
.
include?
(
@ref
)
&&
if
@ref
&&
!
options
.
flatten
.
include?
(
@ref
)
&&
@ref
=~
/\A[0-9a-zA-Z]{6,52}\z/
@ref
=~
/\A[0-9a-zA-Z]{6,52}\z/
)
options
<<
[
'Commit'
,
[
@ref
]]
options
<<
[
'Commit'
,
[
@ref
]]
end
end
...
...
lib/ci/ansi2html.rb
View file @
3ba72f69
...
@@ -98,7 +98,7 @@ module Ci
...
@@ -98,7 +98,7 @@ module Ci
open_new_tag
open_new_tag
s
=
StringScanner
.
new
(
ansi
)
s
=
StringScanner
.
new
(
ansi
)
while
(
!
s
.
eos?
)
until
s
.
eos?
if
s
.
scan
(
/\e([@-_])(.*?)([@-~])/
)
if
s
.
scan
(
/\e([@-_])(.*?)([@-~])/
)
handle_sequence
(
s
)
handle_sequence
(
s
)
elsif
s
.
scan
(
/\e(([@-_])(.*?)?)?$/
)
elsif
s
.
scan
(
/\e(([@-_])(.*?)?)?$/
)
...
...
spec/controllers/projects/group_links_controller_spec.rb
View file @
3ba72f69
...
@@ -28,7 +28,7 @@ describe Projects::GroupLinksController do
...
@@ -28,7 +28,7 @@ describe Projects::GroupLinksController do
expect
(
group
.
shared_projects
).
to
include
project
expect
(
group
.
shared_projects
).
to
include
project
end
end
it
'redirects to project group links page'
do
it
'redirects to project group links page'
do
expect
(
response
).
to
redirect_to
(
expect
(
response
).
to
redirect_to
(
namespace_project_group_links_path
(
project
.
namespace
,
project
)
namespace_project_group_links_path
(
project
.
namespace
,
project
)
)
)
...
...
spec/factories_spec.rb
View file @
3ba72f69
...
@@ -5,7 +5,7 @@ describe 'factories' do
...
@@ -5,7 +5,7 @@ describe 'factories' do
describe
"
#{
factory
.
name
}
factory"
do
describe
"
#{
factory
.
name
}
factory"
do
let
(
:entity
)
{
build
(
factory
.
name
)
}
let
(
:entity
)
{
build
(
factory
.
name
)
}
it
'does not raise error when created
'
do
it
'does not raise error when created
'
do
expect
{
entity
}.
to_not
raise_error
expect
{
entity
}.
to_not
raise_error
end
end
...
...
spec/models/concerns/token_authenticatable_spec.rb
View file @
3ba72f69
...
@@ -49,7 +49,7 @@ describe ApplicationSetting, 'TokenAuthenticatable' do
...
@@ -49,7 +49,7 @@ describe ApplicationSetting, 'TokenAuthenticatable' do
context
'token is generated'
do
context
'token is generated'
do
before
{
subject
.
send
(
"reset_
#{
token_field
}
!"
)
}
before
{
subject
.
send
(
"reset_
#{
token_field
}
!"
)
}
it
'persists a new token
'
do
it
'persists a new token
'
do
expect
(
subject
.
send
(
:read_attribute
,
token_field
)).
to
be_a
String
expect
(
subject
.
send
(
:read_attribute
,
token_field
)).
to
be_a
String
end
end
end
end
...
...
spec/services/issues/create_service_spec.rb
View file @
3ba72f69
...
@@ -54,7 +54,7 @@ describe Issues::CreateService, services: true do
...
@@ -54,7 +54,7 @@ describe Issues::CreateService, services: true do
label_ids:
[
label
.
id
]
}
label_ids:
[
label
.
id
]
}
end
end
it
'does not assign label'
do
it
'does not assign label'
do
expect
(
issue
.
labels
).
to_not
include
label
expect
(
issue
.
labels
).
to_not
include
label
end
end
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