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
fc695338
Commit
fc695338
authored
Sep 21, 2019
by
Takuya Noguchi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken UI on Environment folder
parent
fc843249
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
8 deletions
+20
-8
app/assets/javascripts/environments/folder/environments_folder_view.vue
...ascripts/environments/folder/environments_folder_view.vue
+6
-6
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+0
-1
app/views/projects/environments/folder.html.haml
app/views/projects/environments/folder.html.haml
+3
-1
changelogs/unreleased/32470-ui-degradation-on-environment-folder-view.yml
...eased/32470-ui-degradation-on-environment-folder-view.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+6
-0
No files found.
app/assets/javascripts/environments/folder/environments_folder_view.vue
View file @
fc695338
...
...
@@ -40,13 +40,13 @@ export default {
<div
:class=
"cssContainerClass"
>
<stop-environment-modal
:environment=
"environmentInStopModal"
/>
<div
v-if=
"!isLoading"
class=
"top-area"
>
<h4
class=
"js-folder-name environments-folder-name"
>
{{
s__
(
'
Environments|Environments
'
)
}}
/
<b>
{{
folderName
}}
</b>
</h4>
<h4
class=
"js-folder-name environments-folder-name"
>
{{
s__
(
'
Environments|Environments
'
)
}}
/
<b>
{{
folderName
}}
</b>
</h4>
<tabs
:tabs=
"tabs"
scope=
"environments"
@
onChangeTab=
"onChangeTab"
/>
<div
class=
"top-area"
>
<tabs
v-if=
"!isLoading"
:tabs=
"tabs"
scope=
"environments"
@
onChangeTab=
"onChangeTab"
/>
</div>
<container
...
...
app/assets/stylesheets/pages/environments.scss
View file @
fc695338
...
...
@@ -7,7 +7,6 @@
.environments-folder-name
{
font-weight
:
$gl-font-weight-normal
;
padding-top
:
20px
;
}
.environments-container
{
...
...
app/views/projects/environments/folder.html.haml
View file @
fc695338
-
page_title
_
(
"Environments"
)
-
add_to_breadcrumbs
_
(
"Environments"
),
project_environments_path
(
@project
)
-
breadcrumb_title
_
(
"Folder/%{name}"
)
%
{
name:
@folder
}
-
page_title
_
(
"Environments in %{name}"
)
%
{
name:
@folder
}
#environments-folder-list-view
{
data:
{
environments_data:
environments_folder_list_view_data
}
}
changelogs/unreleased/32470-ui-degradation-on-environment-folder-view.yml
0 → 100644
View file @
fc695338
---
title
:
Fix broken UI on Environment folder
merge_request
:
17427
author
:
Takuya Noguchi
type
:
fixed
locale/gitlab.pot
View file @
fc695338
...
...
@@ -6482,6 +6482,9 @@ msgstr ""
msgid "Environments allow you to track deployments of your application %{link_to_read_more}."
msgstr ""
msgid "Environments in %{name}"
msgstr ""
msgid "EnvironmentsDashboard|Add a project to the dashboard"
msgstr ""
...
...
@@ -7639,6 +7642,9 @@ msgstr ""
msgid "FogBugz import"
msgstr ""
msgid "Folder/%{name}"
msgstr ""
msgid "Follow the steps below to export your Google Code project data."
msgstr ""
...
...
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