Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9798ac77
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9798ac77
编写于
6月 29, 2016
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Enable Style/SpaceAfterColon Rubocop cops
上级
9e8fdead
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
8 addition
and
8 deletion
+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
未找到文件。
.rubocop.yml
浏览文件 @
9798ac77
...
...
@@ -532,7 +532,7 @@ Style/SingleLineMethods:
# Use spaces after colons.
Style/SpaceAfterColon
:
Enabled
:
fals
e
Enabled
:
tru
e
# Use spaces after commas.
Style/SpaceAfterComma
:
...
...
app/controllers/ci/projects_controller.rb
浏览文件 @
9798ac77
...
...
@@ -25,7 +25,7 @@ module Ci
return
render_404
unless
@project
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
protected
...
...
app/helpers/projects_helper.rb
浏览文件 @
9798ac77
...
...
@@ -15,7 +15,7 @@ module ProjectsHelper
def
link_to_member_avatar
(
author
,
opts
=
{})
default_opts
=
{
avatar:
true
,
name:
true
,
size:
16
,
author_class:
'author'
,
title:
":name"
}
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
def
link_to_member
(
project
,
author
,
opts
=
{},
&
block
)
...
...
@@ -27,7 +27,7 @@ module ProjectsHelper
author_html
=
""
# 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
if
opts
[
:by_username
]
...
...
config/routes.rb
浏览文件 @
9798ac77
...
...
@@ -653,7 +653,7 @@ Rails.application.routes.draw do
get
'/wikis/*id'
,
to:
'wikis#show'
,
as:
'wiki'
,
constraints:
WIKI_SLUG_ID
delete
'/wikis/*id'
,
to:
'wikis#destroy'
,
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
resource
:repository
,
only:
[
:show
,
:create
]
do
...
...
features/steps/groups.rb
浏览文件 @
9798ac77
...
...
@@ -93,7 +93,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
step
'I should see new group "Owned" avatar'
do
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
step
'I should see the "Remove avatar" button'
do
...
...
spec/features/projects/import_export/import_file_spec.rb
浏览文件 @
9798ac77
...
...
@@ -24,7 +24,7 @@ feature 'project import', feature: true, js: true do
visit
new_project_path
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'
expect
(
page
).
to
have_content
(
'GitLab project export'
)
...
...
spec/lib/gitlab/import_export/reader_spec.rb
浏览文件 @
9798ac77
require
'spec_helper'
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
(
:project_tree_hash
)
do
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录