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
a1c864d1
Commit
a1c864d1
authored
Nov 26, 2019
by
Sarah Groff Hennigh-Palermo
Committed by
Phil Hughes
Nov 26, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix two bugs in environments table
parent
0ab35262
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
16 deletions
+19
-16
app/assets/javascripts/environments/components/environment_item.vue
.../javascripts/environments/components/environment_item.vue
+13
-7
app/assets/javascripts/environments/components/environments_app.vue
.../javascripts/environments/components/environments_app.vue
+1
-5
app/assets/javascripts/environments/index.js
app/assets/javascripts/environments/index.js
+0
-2
changelogs/unreleased/env-tooltips.yml
changelogs/unreleased/env-tooltips.yml
+5
-0
ee/spec/javascripts/environments/environments_app_spec.js
ee/spec/javascripts/environments/environments_app_spec.js
+0
-1
spec/javascripts/environments/environments_app_spec.js
spec/javascripts/environments/environments_app_spec.js
+0
-1
No files found.
app/assets/javascripts/environments/components/environment_item.vue
View file @
a1c864d1
...
@@ -6,6 +6,7 @@ import _ from 'underscore';
...
@@ -6,6 +6,7 @@ import _ from 'underscore';
import
{
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
{
GlTooltipDirective
}
from
'
@gitlab/ui
'
;
import
UserAvatarLink
from
'
~/vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
UserAvatarLink
from
'
~/vue_shared/components/user_avatar/user_avatar_link.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
TooltipOnTruncate
from
'
~/vue_shared/components/tooltip_on_truncate.vue
'
;
import
environmentItemMixin
from
'
ee_else_ce/environments/mixins/environment_item_mixin
'
;
import
environmentItemMixin
from
'
ee_else_ce/environments/mixins/environment_item_mixin
'
;
import
ActionsComponent
from
'
./environment_actions.vue
'
;
import
ActionsComponent
from
'
./environment_actions.vue
'
;
import
ExternalUrlComponent
from
'
./environment_external_url.vue
'
;
import
ExternalUrlComponent
from
'
./environment_external_url.vue
'
;
...
@@ -26,7 +27,6 @@ const timeagoInstance = new Timeago();
...
@@ -26,7 +27,6 @@ const timeagoInstance = new Timeago();
export
default
{
export
default
{
components
:
{
components
:
{
UserAvatarLink
,
CommitComponent
,
CommitComponent
,
Icon
,
Icon
,
ActionsComponent
,
ActionsComponent
,
...
@@ -35,6 +35,8 @@ export default {
...
@@ -35,6 +35,8 @@ export default {
RollbackComponent
,
RollbackComponent
,
TerminalButtonComponent
,
TerminalButtonComponent
,
MonitoringButtonComponent
,
MonitoringButtonComponent
,
TooltipOnTruncate
,
UserAvatarLink
,
},
},
directives
:
{
directives
:
{
GlTooltip
:
GlTooltipDirective
,
GlTooltip
:
GlTooltipDirective
,
...
@@ -508,12 +510,16 @@ export default {
...
@@ -508,12 +510,16 @@ export default {
</div>
</div>
<div
class=
"table-section section-15 d-none d-sm-none d-md-block"
role=
"gridcell"
>
<div
class=
"table-section section-15 d-none d-sm-none d-md-block"
role=
"gridcell"
>
<a
<a
v-if=
"shouldRenderBuildName"
:href=
"buildPath"
class=
"build-link cgray"
>
v-if=
"shouldRenderBuildName"
<tooltip-on-truncate
:href=
"buildPath"
:title=
"buildName"
class=
"build-link cgray flex-truncate-parent"
truncate-target=
"child"
>
class=
"flex-truncate-parent"
<span
class=
"flex-truncate-child"
>
{{
buildName
}}
</span>
>
<span
class=
"flex-truncate-child"
>
{{
buildName
}}
</span>
</tooltip-on-truncate>
</a>
</a>
</div>
</div>
...
...
app/assets/javascripts/environments/components/environments_app.vue
View file @
a1c864d1
...
@@ -31,10 +31,6 @@ export default {
...
@@ -31,10 +31,6 @@ export default {
type
:
Boolean
,
type
:
Boolean
,
required
:
true
,
required
:
true
,
},
},
cssContainerClass
:
{
type
:
String
,
required
:
true
,
},
newEnvironmentPath
:
{
newEnvironmentPath
:
{
type
:
String
,
type
:
String
,
required
:
true
,
required
:
true
,
...
@@ -93,7 +89,7 @@ export default {
...
@@ -93,7 +89,7 @@ export default {
};
};
</
script
>
</
script
>
<
template
>
<
template
>
<div
:class=
"cssContainerClass"
>
<div>
<stop-environment-modal
:environment=
"environmentInStopModal"
/>
<stop-environment-modal
:environment=
"environmentInStopModal"
/>
<confirm-rollback-modal
:environment=
"environmentInRollbackModal"
/>
<confirm-rollback-modal
:environment=
"environmentInRollbackModal"
/>
...
...
app/assets/javascripts/environments/index.js
View file @
a1c864d1
...
@@ -21,7 +21,6 @@ export default () =>
...
@@ -21,7 +21,6 @@ export default () =>
newEnvironmentPath
:
environmentsData
.
newEnvironmentPath
,
newEnvironmentPath
:
environmentsData
.
newEnvironmentPath
,
helpPagePath
:
environmentsData
.
helpPagePath
,
helpPagePath
:
environmentsData
.
helpPagePath
,
deployBoardsHelpPath
:
environmentsData
.
deployBoardsHelpPath
,
deployBoardsHelpPath
:
environmentsData
.
deployBoardsHelpPath
,
cssContainerClass
:
environmentsData
.
cssClass
,
canCreateEnvironment
:
parseBoolean
(
environmentsData
.
canCreateEnvironment
),
canCreateEnvironment
:
parseBoolean
(
environmentsData
.
canCreateEnvironment
),
canReadEnvironment
:
parseBoolean
(
environmentsData
.
canReadEnvironment
),
canReadEnvironment
:
parseBoolean
(
environmentsData
.
canReadEnvironment
),
};
};
...
@@ -33,7 +32,6 @@ export default () =>
...
@@ -33,7 +32,6 @@ export default () =>
newEnvironmentPath
:
this
.
newEnvironmentPath
,
newEnvironmentPath
:
this
.
newEnvironmentPath
,
helpPagePath
:
this
.
helpPagePath
,
helpPagePath
:
this
.
helpPagePath
,
deployBoardsHelpPath
:
this
.
deployBoardsHelpPath
,
deployBoardsHelpPath
:
this
.
deployBoardsHelpPath
,
cssContainerClass
:
this
.
cssContainerClass
,
canCreateEnvironment
:
this
.
canCreateEnvironment
,
canCreateEnvironment
:
this
.
canCreateEnvironment
,
canReadEnvironment
:
this
.
canReadEnvironment
,
canReadEnvironment
:
this
.
canReadEnvironment
,
...
this
.
canaryCalloutProps
,
...
this
.
canaryCalloutProps
,
...
...
changelogs/unreleased/env-tooltips.yml
0 → 100644
View file @
a1c864d1
---
title
:
Fix tooltip hovers in environments table
merge_request
:
20737
author
:
type
:
fixed
ee/spec/javascripts/environments/environments_app_spec.js
View file @
a1c864d1
...
@@ -10,7 +10,6 @@ describe('Environment', () => {
...
@@ -10,7 +10,6 @@ describe('Environment', () => {
endpoint
:
'
environments.json
'
,
endpoint
:
'
environments.json
'
,
canCreateEnvironment
:
true
,
canCreateEnvironment
:
true
,
canReadEnvironment
:
true
,
canReadEnvironment
:
true
,
cssContainerClass
:
'
container
'
,
newEnvironmentPath
:
'
environments/new
'
,
newEnvironmentPath
:
'
environments/new
'
,
helpPagePath
:
'
help
'
,
helpPagePath
:
'
help
'
,
canaryDeploymentFeatureId
:
'
canary_deployment
'
,
canaryDeploymentFeatureId
:
'
canary_deployment
'
,
...
...
spec/javascripts/environments/environments_app_spec.js
View file @
a1c864d1
...
@@ -10,7 +10,6 @@ describe('Environment', () => {
...
@@ -10,7 +10,6 @@ describe('Environment', () => {
endpoint
:
'
environments.json
'
,
endpoint
:
'
environments.json
'
,
canCreateEnvironment
:
true
,
canCreateEnvironment
:
true
,
canReadEnvironment
:
true
,
canReadEnvironment
:
true
,
cssContainerClass
:
'
container
'
,
newEnvironmentPath
:
'
environments/new
'
,
newEnvironmentPath
:
'
environments/new
'
,
helpPagePath
:
'
help
'
,
helpPagePath
:
'
help
'
,
canaryDeploymentFeatureId
:
'
canary_deployment
'
,
canaryDeploymentFeatureId
:
'
canary_deployment
'
,
...
...
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