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
fc1bbeff
Commit
fc1bbeff
authored
Mar 31, 2020
by
jakeburden
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace mountedToShow with onSingleEnvironmentPage
parent
ebe5d683
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/environments/mixins/environments_mixin.js
...ets/javascripts/environments/mixins/environments_mixin.js
+2
-2
app/assets/javascripts/environments/mount_show.js
app/assets/javascripts/environments/mount_show.js
+1
-1
No files found.
app/assets/javascripts/environments/mixins/environments_mixin.js
View file @
fc1bbeff
...
...
@@ -145,7 +145,7 @@ export default {
deleteEnvironment
(
environment
)
{
const
endpoint
=
environment
.
delete_path
;
const
mountedToShow
=
environment
.
mounted_to_show
;
const
{
onSingleEnvironmentPage
}
=
environment
;
const
errorMessage
=
s__
(
'
Environments|An error occurred while deleting the environment. Check if the environment stopped; if not, stop it and try again.
'
,
);
...
...
@@ -153,7 +153,7 @@ export default {
this
.
service
.
deleteAction
(
endpoint
)
.
then
(()
=>
{
if
(
!
mountedToShow
)
{
if
(
!
onSingleEnvironmentPage
)
{
// Reload as a first solution to bust the ETag cache
window
.
location
.
reload
();
return
;
...
...
app/assets/javascripts/environments/mount_show.js
View file @
fc1bbeff
...
...
@@ -15,7 +15,7 @@ export default () => {
data
()
{
const
environment
=
JSON
.
parse
(
JSON
.
stringify
(
container
.
dataset
));
environment
.
delete_path
=
environment
.
deletePath
;
environment
.
mounted_to_show
=
true
;
environment
.
onSingleEnvironmentPage
=
true
;
return
{
environment
,
...
...
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