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
58a804bb
Commit
58a804bb
authored
Apr 13, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] Convert wells to card, port info-well
parent
6e82c920
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
35 additions
and
19 deletions
+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
No files found.
app/assets/stylesheets/bootstrap_migration.scss
View file @
58a804bb
...
@@ -72,3 +72,19 @@ button, html [type="button"], [type="reset"], [type="submit"] {
...
@@ -72,3 +72,19 @@ button, html [type="button"], [type="reset"], [type="submit"] {
.divider
{
.divider
{
@extend
.dropdown-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
View file @
58a804bb
...
@@ -13,6 +13,6 @@
...
@@ -13,6 +13,6 @@
=
render
@labels
=
render
@labels
=
paginate
@labels
,
theme:
'gitlab'
=
paginate
@labels
,
theme:
'gitlab'
-
else
-
else
.
light-well
.
card.bg-light
.nothing-here-block
There are no labels yet
.nothing-here-block
There are no labels yet
app/views/admin/system_info/show.html.haml
View file @
58a804bb
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
.prepend-top-default
.prepend-top-default
.row
.row
.col-sm-4
.col-sm-4
.
light-well
.
card.bg-light
%h4
CPU
%h4
CPU
.data
.data
-
if
@cpus
-
if
@cpus
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
=
icon
(
'warning'
,
class:
'text-warning'
)
=
icon
(
'warning'
,
class:
'text-warning'
)
Unable to collect CPU info
Unable to collect CPU info
.col-sm-4
.col-sm-4
.
light-well
.
card.bg-light
%h4
Memory Usage
%h4
Memory Usage
.data
.data
-
if
@memory
-
if
@memory
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
=
icon
(
'warning'
,
class:
'text-warning'
)
=
icon
(
'warning'
,
class:
'text-warning'
)
Unable to collect memory info
Unable to collect memory info
.col-sm-4
.col-sm-4
.
light-well
.
card.bg-light
%h4
Disk Usage
%h4
Disk Usage
.data
.data
-
@disks
.
each
do
|
disk
|
-
@disks
.
each
do
|
disk
|
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
%p
=
disk
[
:disk_name
]
%p
=
disk
[
:disk_name
]
%p
=
disk
[
:mount_path
]
%p
=
disk
[
:mount_path
]
.col-sm-4
.col-sm-4
.
light-well
.
card.bg-light
%h4
Uptime
%h4
Uptime
.data
.data
%h1
=
distance_of_time_in_words_to_now
(
Rails
.
application
.
config
.
booted_at
)
%h1
=
distance_of_time_in_words_to_now
(
Rails
.
application
.
config
.
booted_at
)
app/views/profiles/two_factor_auths/_codes.html.haml
View file @
58a804bb
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
%b
will
%b
will
lose access to your account.
lose access to your account.
.codes.
well
.codes.
card
%ul
%ul
-
@codes
.
each
do
|
code
|
-
@codes
.
each
do
|
code
|
%li
%li
...
...
app/views/projects/clusters/_advanced_settings.html.haml
View file @
58a804bb
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
-
link_gke
=
link_to
(
s_
(
'ClusterIntegration|Google Kubernetes Engine'
),
@cluster
.
gke_cluster_url
,
target:
'_blank'
,
rel:
'noopener noreferrer'
)
-
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
}
=
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
%label
.text-danger
=
s_
(
'ClusterIntegration|Remove Kubernetes cluster integration'
)
=
s_
(
'ClusterIntegration|Remove Kubernetes cluster integration'
)
%p
%p
...
...
app/views/projects/compare/show.html.haml
View file @
58a804bb
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
=
render
"projects/commits/commit_list"
=
render
"projects/commits/commit_list"
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
,
environment:
@environment
=
render
"projects/diffs/diffs"
,
diffs:
@diffs
,
environment:
@environment
-
else
-
else
.
light-well
.
card.bg-light
.center
.center
%h4
%h4
=
s_
(
"CompareBranches|There isn't anything to compare."
)
=
s_
(
"CompareBranches|There isn't anything to compare."
)
...
...
app/views/projects/empty.html.haml
View file @
58a804bb
...
@@ -44,14 +44,14 @@
...
@@ -44,14 +44,14 @@
.git-empty
.git-empty
%fieldset
%fieldset
%h5
Git global setup
%h5
Git global setup
%pre
.
light-well
%pre
.
card.bg-light
:preserve
:preserve
git config --global user.name "
#{
h
git_user_name
}
"
git config --global user.name "
#{
h
git_user_name
}
"
git config --global user.email "
#{
h
git_user_email
}
"
git config --global user.email "
#{
h
git_user_email
}
"
%fieldset
%fieldset
%h5
Create a new repository
%h5
Create a new repository
%pre
.
light-well
%pre
.
card.bg-light
:preserve
:preserve
git clone
#{
content_tag
(
:span
,
default_url_to_repo
,
class:
'clone'
)
}
git clone
#{
content_tag
(
:span
,
default_url_to_repo
,
class:
'clone'
)
}
cd
#{
h
@project
.
path
}
cd
#{
h
@project
.
path
}
...
@@ -62,7 +62,7 @@
...
@@ -62,7 +62,7 @@
%fieldset
%fieldset
%h5
Existing folder
%h5
Existing folder
%pre
.
light-well
%pre
.
card.bg-light
:preserve
:preserve
cd existing_folder
cd existing_folder
git init
git init
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
%fieldset
%fieldset
%h5
Existing Git repository
%h5
Existing Git repository
%pre
.
light-well
%pre
.
card.bg-light
:preserve
:preserve
cd existing_repo
cd existing_repo
git remote rename origin old-origin
git remote rename origin old-origin
...
...
app/views/projects/pipeline_schedules/index.html.haml
View file @
58a804bb
...
@@ -18,5 +18,5 @@
...
@@ -18,5 +18,5 @@
%ul
.content-list
%ul
.content-list
=
render
partial:
"table"
=
render
partial:
"table"
-
else
-
else
.
light-well
.
card.bg-light
.nothing-here-block
=
_
(
"No schedules"
)
.nothing-here-block
=
_
(
"No schedules"
)
app/views/projects/services/mattermost_slash_commands/_help.html.haml
View file @
58a804bb
-
enabled
=
Gitlab
.
config
.
mattermost
.
enabled
-
enabled
=
Gitlab
.
config
.
mattermost
.
enabled
.
well
.
card
%p
%p
This service allows users to perform common operations on this
This service allows users to perform common operations on this
project by entering slash commands in Mattermost.
project by entering slash commands in Mattermost.
...
...
app/views/projects/services/prometheus/_help.html.haml
View file @
58a804bb
...
@@ -5,5 +5,5 @@
...
@@ -5,5 +5,5 @@
=
s_
(
'PrometheusService|Manual configuration'
)
=
s_
(
'PrometheusService|Manual configuration'
)
-
unless
@service
.
editable?
-
unless
@service
.
editable?
.
well
.
card
=
s_
(
'PrometheusService|To enable manual configuration, uninstall Prometheus from your clusters'
)
=
s_
(
'PrometheusService|To enable manual configuration, uninstall Prometheus from your clusters'
)
app/views/projects/services/slack_slash_commands/_help.html.haml
View file @
58a804bb
-
pretty_name
=
defined?
(
@project
)
?
@project
.
full_name
:
'namespace / path'
-
pretty_name
=
defined?
(
@project
)
?
@project
.
full_name
:
'namespace / path'
-
run_actions_text
=
"Perform common operations on GitLab project:
#{
pretty_name
}
"
-
run_actions_text
=
"Perform common operations on GitLab project:
#{
pretty_name
}
"
.
well
.
card
%p
%p
This service allows users to perform common operations on this
This service allows users to perform common operations on this
project by entering slash commands in Slack.
project by entering slash commands in Slack.
...
...
app/views/shared/_import_form.html.haml
View file @
58a804bb
...
@@ -7,7 +7,7 @@
...
@@ -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
=
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
%ul
%li
%li
=
_
(
'The repository must be accessible over <code>http://</code>, <code>https://</code> or <code>git://</code>.'
).
html_safe
=
_
(
'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
View file @
58a804bb
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
-
if
lookup_context
.
template_exists?
(
'help'
,
"projects/services/
#{
@service
.
to_param
}
"
,
true
)
-
if
lookup_context
.
template_exists?
(
'help'
,
"projects/services/
#{
@service
.
to_param
}
"
,
true
)
=
render
"projects/services/
#{
@service
.
to_param
}
/help"
,
subject:
subject
=
render
"projects/services/
#{
@service
.
to_param
}
/help"
,
subject:
subject
-
elsif
@service
.
help
.
present?
-
elsif
@service
.
help
.
present?
.
well
.
card
=
markdown
@service
.
help
=
markdown
@service
.
help
.service-settings
.service-settings
...
...
app/views/shared/plugins/_index.html.haml
View file @
58a804bb
...
@@ -19,5 +19,5 @@
...
@@ -19,5 +19,5 @@
.monospace
.monospace
=
File
.
basename
(
file
)
=
File
.
basename
(
file
)
-
else
-
else
%p
.
light-well
.text-center
%p
.
card.bg-light
.text-center
No plugins found.
No plugins found.
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