Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
58a804bb
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,发现更多精彩内容 >>
提交
58a804bb
编写于
4月 13, 2018
作者:
C
Clement Ho
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[skip ci] Convert wells to card, port info-well
上级
6e82c920
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
35 addition
and
19 deletion
+35
-19
app/assets/stylesheets/bootstrap_migration.scss
app/assets/stylesheets/bootstrap_migration.scss
+16
-0
app/views/admin/labels/index.html.haml
app/views/admin/labels/index.html.haml
+1
-1
app/views/admin/system_info/show.html.haml
app/views/admin/system_info/show.html.haml
+4
-4
app/views/profiles/two_factor_auths/_codes.html.haml
app/views/profiles/two_factor_auths/_codes.html.haml
+1
-1
app/views/projects/clusters/_advanced_settings.html.haml
app/views/projects/clusters/_advanced_settings.html.haml
+1
-1
app/views/projects/compare/show.html.haml
app/views/projects/compare/show.html.haml
+1
-1
app/views/projects/empty.html.haml
app/views/projects/empty.html.haml
+4
-4
app/views/projects/pipeline_schedules/index.html.haml
app/views/projects/pipeline_schedules/index.html.haml
+1
-1
app/views/projects/services/mattermost_slash_commands/_help.html.haml
...ojects/services/mattermost_slash_commands/_help.html.haml
+1
-1
app/views/projects/services/prometheus/_help.html.haml
app/views/projects/services/prometheus/_help.html.haml
+1
-1
app/views/projects/services/slack_slash_commands/_help.html.haml
...ws/projects/services/slack_slash_commands/_help.html.haml
+1
-1
app/views/shared/_import_form.html.haml
app/views/shared/_import_form.html.haml
+1
-1
app/views/shared/_service_settings.html.haml
app/views/shared/_service_settings.html.haml
+1
-1
app/views/shared/plugins/_index.html.haml
app/views/shared/plugins/_index.html.haml
+1
-1
未找到文件。
app/assets/stylesheets/bootstrap_migration.scss
浏览文件 @
58a804bb
...
...
@@ -72,3 +72,19 @@ button, html [type="button"], [type="reset"], [type="submit"] {
.divider
{
@extend
.dropdown-divider
;
}
.info-well
{
background
:
$theme-gray-50
;
color
:
$gl-text-color
;
border
:
1px
solid
$border-color
;
border-radius
:
4px
;
margin-bottom
:
16px
;
.well-segment
{
padding
:
16px
;
&
:not
(
:last-of-type
)
{
border-bottom
:
1px
solid
$well-inner-border
;
}
}
}
app/views/admin/labels/index.html.haml
浏览文件 @
58a804bb
...
...
@@ -13,6 +13,6 @@
=
render
@labels
=
paginate
@labels
,
theme:
'gitlab'
-
else
.
light-well
.
card.bg-light
.nothing-here-block
There are no labels yet
app/views/admin/system_info/show.html.haml
浏览文件 @
58a804bb
...
...
@@ -5,7 +5,7 @@
.prepend-top-default
.row
.col-sm-4
.
light-well
.
card.bg-light
%h4
CPU
.data
-
if
@cpus
...
...
@@ -14,7 +14,7 @@
=
icon
(
'warning'
,
class:
'text-warning'
)
Unable to collect CPU info
.col-sm-4
.
light-well
.
card.bg-light
%h4
Memory Usage
.data
-
if
@memory
...
...
@@ -23,7 +23,7 @@
=
icon
(
'warning'
,
class:
'text-warning'
)
Unable to collect memory info
.col-sm-4
.
light-well
.
card.bg-light
%h4
Disk Usage
.data
-
@disks
.
each
do
|
disk
|
...
...
@@ -31,7 +31,7 @@
%p
=
disk
[
:disk_name
]
%p
=
disk
[
:mount_path
]
.col-sm-4
.
light-well
.
card.bg-light
%h4
Uptime
.data
%h1
=
distance_of_time_in_words_to_now
(
Rails
.
application
.
config
.
booted_at
)
app/views/profiles/two_factor_auths/_codes.html.haml
浏览文件 @
58a804bb
...
...
@@ -4,7 +4,7 @@
%b
will
lose access to your account.
.codes.
well
.codes.
card
%ul
-
@codes
.
each
do
|
code
|
%li
...
...
app/views/projects/clusters/_advanced_settings.html.haml
浏览文件 @
58a804bb
...
...
@@ -7,7 +7,7 @@
-
link_gke
=
link_to
(
s_
(
'ClusterIntegration|Google Kubernetes Engine'
),
@cluster
.
gke_cluster_url
,
target:
'_blank'
,
rel:
'noopener noreferrer'
)
=
s_
(
'ClusterIntegration|Manage your Kubernetes cluster by visiting %{link_gke}'
).
html_safe
%
{
link_gke:
link_gke
}
.
well
.form-group
.
card
.form-group
%label
.text-danger
=
s_
(
'ClusterIntegration|Remove Kubernetes cluster integration'
)
%p
...
...
app/views/projects/compare/show.html.haml
浏览文件 @
58a804bb
...
...
@@ -10,7 +10,7 @@
=
render
"projects/commits/commit_list"
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
,
environment:
@environment
-
else
.
light-well
.
card.bg-light
.center
%h4
=
s_
(
"CompareBranches|There isn't anything to compare."
)
...
...
app/views/projects/empty.html.haml
浏览文件 @
58a804bb
...
...
@@ -44,14 +44,14 @@
.git-empty
%fieldset
%h5
Git global setup
%pre
.
light-well
%pre
.
card.bg-light
:preserve
git config --global user.name "
#{
h
git_user_name
}
"
git config --global user.email "
#{
h
git_user_email
}
"
%fieldset
%h5
Create a new repository
%pre
.
light-well
%pre
.
card.bg-light
:preserve
git clone
#{
content_tag
(
:span
,
default_url_to_repo
,
class:
'clone'
)
}
cd
#{
h
@project
.
path
}
...
...
@@ -62,7 +62,7 @@
%fieldset
%h5
Existing folder
%pre
.
light-well
%pre
.
card.bg-light
:preserve
cd existing_folder
git init
...
...
@@ -73,7 +73,7 @@
%fieldset
%h5
Existing Git repository
%pre
.
light-well
%pre
.
card.bg-light
:preserve
cd existing_repo
git remote rename origin old-origin
...
...
app/views/projects/pipeline_schedules/index.html.haml
浏览文件 @
58a804bb
...
...
@@ -18,5 +18,5 @@
%ul
.content-list
=
render
partial:
"table"
-
else
.
light-well
.
card.bg-light
.nothing-here-block
=
_
(
"No schedules"
)
app/views/projects/services/mattermost_slash_commands/_help.html.haml
浏览文件 @
58a804bb
-
enabled
=
Gitlab
.
config
.
mattermost
.
enabled
.
well
.
card
%p
This service allows users to perform common operations on this
project by entering slash commands in Mattermost.
...
...
app/views/projects/services/prometheus/_help.html.haml
浏览文件 @
58a804bb
...
...
@@ -5,5 +5,5 @@
=
s_
(
'PrometheusService|Manual configuration'
)
-
unless
@service
.
editable?
.
well
.
card
=
s_
(
'PrometheusService|To enable manual configuration, uninstall Prometheus from your clusters'
)
app/views/projects/services/slack_slash_commands/_help.html.haml
浏览文件 @
58a804bb
-
pretty_name
=
defined?
(
@project
)
?
@project
.
full_name
:
'namespace / path'
-
run_actions_text
=
"Perform common operations on GitLab project:
#{
pretty_name
}
"
.
well
.
card
%p
This service allows users to perform common operations on this
project by entering slash commands in Slack.
...
...
app/views/shared/_import_form.html.haml
浏览文件 @
58a804bb
...
...
@@ -7,7 +7,7 @@
=
f
.
text_field
:import_url
,
autocomplete:
'off'
,
class:
'form-control'
,
placeholder:
'https://username:password@gitlab.company.com/group/project.git'
,
required:
true
.
well
.prepend-top-20
.
card
.prepend-top-20
%ul
%li
=
_
(
'The repository must be accessible over <code>http://</code>, <code>https://</code> or <code>git://</code>.'
).
html_safe
...
...
app/views/shared/_service_settings.html.haml
浏览文件 @
58a804bb
...
...
@@ -3,7 +3,7 @@
-
if
lookup_context
.
template_exists?
(
'help'
,
"projects/services/
#{
@service
.
to_param
}
"
,
true
)
=
render
"projects/services/
#{
@service
.
to_param
}
/help"
,
subject:
subject
-
elsif
@service
.
help
.
present?
.
well
.
card
=
markdown
@service
.
help
.service-settings
...
...
app/views/shared/plugins/_index.html.haml
浏览文件 @
58a804bb
...
...
@@ -19,5 +19,5 @@
.monospace
=
File
.
basename
(
file
)
-
else
%p
.
light-well
.text-center
%p
.
card.bg-light
.text-center
No plugins found.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录