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
9798ac77
Commit
9798ac77
authored
Jun 29, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable Style/SpaceAfterColon Rubocop cops
parent
9e8fdead
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
8 deletions
+8
-8
.rubocop.yml
.rubocop.yml
+1
-1
app/controllers/ci/projects_controller.rb
app/controllers/ci/projects_controller.rb
+1
-1
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+2
-2
config/routes.rb
config/routes.rb
+1
-1
features/steps/groups.rb
features/steps/groups.rb
+1
-1
spec/features/projects/import_export/import_file_spec.rb
spec/features/projects/import_export/import_file_spec.rb
+1
-1
spec/lib/gitlab/import_export/reader_spec.rb
spec/lib/gitlab/import_export/reader_spec.rb
+1
-1
No files found.
.rubocop.yml
View file @
9798ac77
...
@@ -532,7 +532,7 @@ Style/SingleLineMethods:
...
@@ -532,7 +532,7 @@ Style/SingleLineMethods:
# Use spaces after colons.
# Use spaces after colons.
Style/SpaceAfterColon
:
Style/SpaceAfterColon
:
Enabled
:
fals
e
Enabled
:
tru
e
# Use spaces after commas.
# Use spaces after commas.
Style/SpaceAfterComma
:
Style/SpaceAfterComma
:
...
...
app/controllers/ci/projects_controller.rb
View file @
9798ac77
...
@@ -25,7 +25,7 @@ module Ci
...
@@ -25,7 +25,7 @@ module Ci
return
render_404
unless
@project
return
render_404
unless
@project
image
=
Ci
::
ImageForBuildService
.
new
.
execute
(
@project
,
params
)
image
=
Ci
::
ImageForBuildService
.
new
.
execute
(
@project
,
params
)
send_file
image
.
path
,
filename:
image
.
name
,
disposition:
'inline'
,
type
:"image/svg+xml"
send_file
image
.
path
,
filename:
image
.
name
,
disposition:
'inline'
,
type:
"image/svg+xml"
end
end
protected
protected
...
...
app/helpers/projects_helper.rb
View file @
9798ac77
...
@@ -15,7 +15,7 @@ module ProjectsHelper
...
@@ -15,7 +15,7 @@ module ProjectsHelper
def
link_to_member_avatar
(
author
,
opts
=
{})
def
link_to_member_avatar
(
author
,
opts
=
{})
default_opts
=
{
avatar:
true
,
name:
true
,
size:
16
,
author_class:
'author'
,
title:
":name"
}
default_opts
=
{
avatar:
true
,
name:
true
,
size:
16
,
author_class:
'author'
,
title:
":name"
}
opts
=
default_opts
.
merge
(
opts
)
opts
=
default_opts
.
merge
(
opts
)
image_tag
(
avatar_icon
(
author
,
opts
[
:size
]),
width:
opts
[
:size
],
class:
"avatar avatar-inline
#{
"s
#{
opts
[
:size
]
}
"
if
opts
[
:size
]
}
"
,
alt
:''
)
if
opts
[
:avatar
]
image_tag
(
avatar_icon
(
author
,
opts
[
:size
]),
width:
opts
[
:size
],
class:
"avatar avatar-inline
#{
"s
#{
opts
[
:size
]
}
"
if
opts
[
:size
]
}
"
,
alt:
''
)
if
opts
[
:avatar
]
end
end
def
link_to_member
(
project
,
author
,
opts
=
{},
&
block
)
def
link_to_member
(
project
,
author
,
opts
=
{},
&
block
)
...
@@ -27,7 +27,7 @@ module ProjectsHelper
...
@@ -27,7 +27,7 @@ module ProjectsHelper
author_html
=
""
author_html
=
""
# Build avatar image tag
# Build avatar image tag
author_html
<<
image_tag
(
avatar_icon
(
author
,
opts
[
:size
]),
width:
opts
[
:size
],
class:
"avatar avatar-inline
#{
"s
#{
opts
[
:size
]
}
"
if
opts
[
:size
]
}
"
,
alt
:''
)
if
opts
[
:avatar
]
author_html
<<
image_tag
(
avatar_icon
(
author
,
opts
[
:size
]),
width:
opts
[
:size
],
class:
"avatar avatar-inline
#{
"s
#{
opts
[
:size
]
}
"
if
opts
[
:size
]
}
"
,
alt:
''
)
if
opts
[
:avatar
]
# Build name span tag
# Build name span tag
if
opts
[
:by_username
]
if
opts
[
:by_username
]
...
...
config/routes.rb
View file @
9798ac77
...
@@ -653,7 +653,7 @@ Rails.application.routes.draw do
...
@@ -653,7 +653,7 @@ Rails.application.routes.draw do
get
'/wikis/*id'
,
to:
'wikis#show'
,
as:
'wiki'
,
constraints:
WIKI_SLUG_ID
get
'/wikis/*id'
,
to:
'wikis#show'
,
as:
'wiki'
,
constraints:
WIKI_SLUG_ID
delete
'/wikis/*id'
,
to:
'wikis#destroy'
,
constraints:
WIKI_SLUG_ID
delete
'/wikis/*id'
,
to:
'wikis#destroy'
,
constraints:
WIKI_SLUG_ID
put
'/wikis/*id'
,
to:
'wikis#update'
,
constraints:
WIKI_SLUG_ID
put
'/wikis/*id'
,
to:
'wikis#update'
,
constraints:
WIKI_SLUG_ID
post
'/wikis/*id/markdown_preview'
,
to
:'wikis#markdown_preview'
,
constraints:
WIKI_SLUG_ID
,
as:
'wiki_markdown_preview'
post
'/wikis/*id/markdown_preview'
,
to:
'wikis#markdown_preview'
,
constraints:
WIKI_SLUG_ID
,
as:
'wiki_markdown_preview'
end
end
resource
:repository
,
only:
[
:show
,
:create
]
do
resource
:repository
,
only:
[
:show
,
:create
]
do
...
...
features/steps/groups.rb
View file @
9798ac77
...
@@ -93,7 +93,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
...
@@ -93,7 +93,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
step
'I should see new group "Owned" avatar'
do
step
'I should see new group "Owned" avatar'
do
expect
(
owned_group
.
avatar
).
to
be_instance_of
AvatarUploader
expect
(
owned_group
.
avatar
).
to
be_instance_of
AvatarUploader
expect
(
owned_group
.
avatar
.
url
).
to
eq
"/uploads/group/avatar/
#{
Group
.
find_by
(
name
:"Owned"
).
id
}
/banana_sample.gif"
expect
(
owned_group
.
avatar
.
url
).
to
eq
"/uploads/group/avatar/
#{
Group
.
find_by
(
name:
"Owned"
).
id
}
/banana_sample.gif"
end
end
step
'I should see the "Remove avatar" button'
do
step
'I should see the "Remove avatar" button'
do
...
...
spec/features/projects/import_export/import_file_spec.rb
View file @
9798ac77
...
@@ -24,7 +24,7 @@ feature 'project import', feature: true, js: true do
...
@@ -24,7 +24,7 @@ feature 'project import', feature: true, js: true do
visit
new_project_path
visit
new_project_path
select2
(
'2'
,
from:
'#project_namespace_id'
)
select2
(
'2'
,
from:
'#project_namespace_id'
)
fill_in
:project_path
,
with
:'test-project-path'
,
visible:
true
fill_in
:project_path
,
with:
'test-project-path'
,
visible:
true
click_link
'GitLab export'
click_link
'GitLab export'
expect
(
page
).
to
have_content
(
'GitLab project export'
)
expect
(
page
).
to
have_content
(
'GitLab project export'
)
...
...
spec/lib/gitlab/import_export/reader_spec.rb
View file @
9798ac77
require
'spec_helper'
require
'spec_helper'
describe
Gitlab
::
ImportExport
::
Reader
,
lib:
true
do
describe
Gitlab
::
ImportExport
::
Reader
,
lib:
true
do
let
(
:shared
)
{
Gitlab
::
ImportExport
::
Shared
.
new
(
relative_path
:''
)
}
let
(
:shared
)
{
Gitlab
::
ImportExport
::
Shared
.
new
(
relative_path:
''
)
}
let
(
:test_config
)
{
'spec/support/import_export/import_export.yml'
}
let
(
:test_config
)
{
'spec/support/import_export/import_export.yml'
}
let
(
:project_tree_hash
)
do
let
(
:project_tree_hash
)
do
{
{
...
...
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