Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
aff288a2
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,发现更多精彩内容 >>
提交
aff288a2
编写于
5月 16, 2016
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Project settings UI update
上级
f26389a0
变更
6
展开全部
隐藏空白更改
内联
并排
Showing
6 changed file
with
273 addition
and
323 deletion
+273
-323
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+0
-8
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+1
-1
app/assets/stylesheets/pages/settings.scss
app/assets/stylesheets/pages/settings.scss
+8
-0
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+2
-2
app/views/projects/_builds_settings.html.haml
app/views/projects/_builds_settings.html.haml
+55
-64
app/views/projects/edit.html.haml
app/views/projects/edit.html.haml
+207
-248
未找到文件。
app/assets/stylesheets/pages/profile.scss
浏览文件 @
aff288a2
...
@@ -134,14 +134,6 @@
...
@@ -134,14 +134,6 @@
}
}
}
}
.change-username-title
{
color
:
$gl-warning
;
}
.remove-account-title
{
color
:
$gl-danger
;
}
.provider-btn-group
{
.provider-btn-group
{
display
:
inline-block
;
display
:
inline-block
;
margin-right
:
10px
;
margin-right
:
10px
;
...
...
app/assets/stylesheets/pages/projects.scss
浏览文件 @
aff288a2
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
margin-bottom
:
0
;
margin-bottom
:
0
;
}
}
.new_project
,
.new_project
,
.edit
_
project
{
.edit
-
project
{
fieldset
.features
{
fieldset
.features
{
.control-label
{
.control-label
{
font-weight
:
normal
;
font-weight
:
normal
;
...
...
app/assets/stylesheets/pages/settings.scss
浏览文件 @
aff288a2
...
@@ -12,3 +12,11 @@
...
@@ -12,3 +12,11 @@
border
:
1px
solid
$warning-message-border
;
border
:
1px
solid
$warning-message-border
;
border-radius
:
$border-radius-base
;
border-radius
:
$border-radius-base
;
}
}
.warning-title
{
color
:
$gl-warning
;
}
.danger-title
{
color
:
$gl-danger
;
}
app/views/profiles/accounts/show.html.haml
浏览文件 @
aff288a2
...
@@ -70,7 +70,7 @@
...
@@ -70,7 +70,7 @@
-
if
current_user
.
can_change_username?
-
if
current_user
.
can_change_username?
.row.prepend-top-default
.row.prepend-top-default
.col-lg-3.profile-settings-sidebar
.col-lg-3.profile-settings-sidebar
%h4
.prepend-top-0.
change-username
-title
%h4
.prepend-top-0.
warning
-title
Change username
Change username
%p
%p
Changing your username will change path to all personal projects!
Changing your username will change path to all personal projects!
...
@@ -94,7 +94,7 @@
...
@@ -94,7 +94,7 @@
-
if
signup_enabled?
-
if
signup_enabled?
.row.prepend-top-default
.row.prepend-top-default
.col-lg-3.profile-settings-sidebar
.col-lg-3.profile-settings-sidebar
%h4
.prepend-top-0.
remove-account
-title
%h4
.prepend-top-0.
danger
-title
Remove account
Remove account
.col-lg-9
.col-lg-9
-
if
@user
.
can_be_removed?
-
if
@user
.
can_be_removed?
...
...
app/views/projects/_builds_settings.html.haml
浏览文件 @
aff288a2
%fieldset
.builds-feature
%fieldset
.builds-feature
%legend
%h5
.prepend-top-0
Builds:
Builds
-
unless
@repository
.
gitlab_ci_yml
-
unless
@repository
.
gitlab_ci_yml
.form-group
.form-group
.col-sm-offset-2.col-sm-10
%p
Builds need to be configured before you can begin using Continuous Integration.
%p
Builds need to be configured before you can begin using Continuous Integration.
=
link_to
'Get started with Builds'
,
help_page_path
(
'ci/quick_start'
,
'README'
),
class:
'btn btn-info'
=
link_to
'Get started with Builds'
,
help_page_path
(
'ci/quick_start'
,
'README'
),
class:
'btn btn-info'
%hr
.form-group
.form-group
.col-sm-offset-2.col-sm-10
%p
Get recent application code using the following command:
%p
Get recent application code using the following command:
.radio
.radio
=
f
.
label
:build_allow_git_fetch_false
do
=
f
.
label
:build_allow_git_fetch_false
do
=
f
.
radio_button
:build_allow_git_fetch
,
'false'
=
f
.
radio_button
:build_allow_git_fetch
,
'false'
%strong
git clone
%strong
git clone
%br
%br
%span
.descr
Slower but makes sure you have a clean dir before every build
%span
.descr
Slower but makes sure you have a clean dir before every build
.radio
.radio
=
f
.
label
:build_allow_git_fetch_true
do
=
f
.
label
:build_allow_git_fetch_true
do
=
f
.
radio_button
:build_allow_git_fetch
,
'true'
=
f
.
radio_button
:build_allow_git_fetch
,
'true'
%strong
git fetch
%strong
git fetch
%br
%br
%span
.descr
Faster
%span
.descr
Faster
.form-group
.form-group
=
f
.
label
:build_timeout_in_minutes
,
'Timeout'
,
class:
'control-label'
=
f
.
label
:build_timeout_in_minutes
,
'Timeout'
,
class:
'label-light'
.col-sm-10
=
f
.
number_field
:build_timeout_in_minutes
,
class:
'form-control'
,
min:
'0'
=
f
.
number_field
:build_timeout_in_minutes
,
class:
'form-control'
,
min:
'0'
%p
.help-block
per build in minutes
%p
.help-block
per build in minutes
.form-group
.form-group
=
f
.
label
:build_coverage_regex
,
"Test coverage parsing"
,
class:
'control-label'
=
f
.
label
:build_coverage_regex
,
"Test coverage parsing"
,
class:
'label-light'
.col-sm-10
.input-group
.input-group
%span
.input-group-addon
/
%span
.input-group-addon
/
=
f
.
text_field
:build_coverage_regex
,
class:
'form-control'
,
placeholder:
'\(\d+.\d+\%\) covered'
=
f
.
text_field
:build_coverage_regex
,
class:
'form-control'
,
placeholder:
'\(\d+.\d+\%\) covered'
%span
.input-group-addon
/
%span
.input-group-addon
/
%p
.help-block
%p
.help-block
We will use this regular expression to find test coverage output in build trace.
We will use this regular expression to find test coverage output in build trace.
Leave blank if you want to disable this feature
Leave blank if you want to disable this feature
.bs-callout.bs-callout-info
.bs-callout.bs-callout-info
%p
Below are examples of regex for existing tools:
%p
Below are examples of regex for existing tools:
%ul
%ul
%li
%li
Simplecov (Ruby) -
Simplecov (Ruby) -
%code
\(\d+.\d+\%\) covered
%code
\(\d+.\d+\%\) covered
%li
%li
pytest-cov (Python) -
pytest-cov (Python) -
%code
\d+\%\s*$
%code
\d+\%\s*$
%li
%li
phpunit --coverage-text --colors=never (PHP) -
phpunit --coverage-text --colors=never (PHP) -
%code
^\s*Lines:\s*\d+.\d+\%
%code
^\s*Lines:\s*\d+.\d+\%
%li
%li
gcovr (C/C++) -
gcovr (C/C++) -
%code
^TOTAL.*\s+(\d+\%)$
%code
^TOTAL.*\s+(\d+\%)$
%li
%li
tap --coverage-report=text-summary (Node.js) -
tap --coverage-report=text-summary (Node.js) -
%code
^Statements\s*:\s*([^%]+)
%code
^Statements\s*:\s*([^%]+)
.form-group
.form-group
.col-sm-offset-2.col-sm-10
.checkbox
.checkbox
=
f
.
label
:public_builds
do
=
f
.
label
:public_builds
do
=
f
.
check_box
:public_builds
=
f
.
check_box
:public_builds
%strong
Public builds
%strong
Public builds
.help-block
Allow everyone to access builds for Public and Internal projects
.help-block
Allow everyone to access builds for Public and Internal projects
.form-group
.form-group.append-bottom-0
=
f
.
label
:runners_token
,
"Runners token"
,
class:
'control-label'
=
f
.
label
:runners_token
,
"Runners token"
,
class:
'label-light'
.col-sm-10
=
f
.
text_field
:runners_token
,
class:
"form-control"
,
placeholder:
'xEeFCaDAB89'
=
f
.
text_field
:runners_token
,
class:
"form-control"
,
placeholder:
'xEeFCaDAB89'
%p
.help-block
The secure token used to checkout project.
%p
.help-block
The secure token used to checkout project.
app/views/projects/edit.html.haml
浏览文件 @
aff288a2
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录