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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
a5989900
Commit
a5989900
authored
May 03, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove service being provided as a prop on environments table
parent
2d6f1e96
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
11 deletions
+6
-11
app/assets/javascripts/environments/components/environment.vue
...ssets/javascripts/environments/components/environment.vue
+4
-9
app/assets/javascripts/environments/folder/environments_folder_view.vue
...ascripts/environments/folder/environments_folder_view.vue
+2
-2
No files found.
app/assets/javascripts/environments/components/environment.vue
View file @
a5989900
<
script
>
<
script
>
/* eslint-disable no-new */
/* global Flash */
/* global Flash */
import
EnvironmentsService
from
'
../services/environments_service
'
;
import
EnvironmentsService
from
'
../services/environments_service
'
;
import
EnvironmentTable
from
'
./environments_table.vue
'
;
import
EnvironmentTable
from
'
./environments_table.vue
'
;
...
@@ -123,6 +121,7 @@ export default {
...
@@ -123,6 +121,7 @@ export default {
})
})
.
catch
(()
=>
{
.
catch
(()
=>
{
this
.
isLoading
=
false
;
this
.
isLoading
=
false
;
// eslint-disable-next-line no-new
new
Flash
(
'
An error occurred while fetching the environments.
'
);
new
Flash
(
'
An error occurred while fetching the environments.
'
);
});
});
},
},
...
@@ -138,19 +137,15 @@ export default {
...
@@ -138,19 +137,15 @@ export default {
})
})
.
catch
(()
=>
{
.
catch
(()
=>
{
this
.
isLoadingFolderContent
=
false
;
this
.
isLoadingFolderContent
=
false
;
// eslint-disable-next-line no-new
new
Flash
(
'
An error occurred while fetching the environments.
'
);
new
Flash
(
'
An error occurred while fetching the environments.
'
);
});
});
},
},
postAction
(
endpoint
)
{
postAction
(
endpoint
)
{
this
.
service
.
postAction
(
endpoint
)
this
.
service
.
postAction
(
endpoint
)
.
then
(()
=>
{
.
then
(()
=>
this
.
fetchEnvironments
())
this
.
fetchEnvironments
();
.
catch
(()
=>
new
Flash
(
'
An error occured while making the request.
'
));
})
.
catch
(()
=>
{
// eslint-disable-next-line no-new
new
Flash
(
'
An error occured while making the request.
'
);
});
},
},
},
},
};
};
...
...
app/assets/javascripts/environments/folder/environments_folder_view.vue
View file @
a5989900
<
script
>
<
script
>
/* eslint-disable no-new */
/* global Flash */
/* global Flash */
import
EnvironmentsService
from
'
../services/environments_service
'
;
import
EnvironmentsService
from
'
../services/environments_service
'
;
import
EnvironmentTable
from
'
../components/environments_table.vue
'
;
import
EnvironmentTable
from
'
../components/environments_table.vue
'
;
...
@@ -99,6 +98,7 @@ export default {
...
@@ -99,6 +98,7 @@ export default {
})
})
.
catch
(()
=>
{
.
catch
(()
=>
{
this
.
isLoading
=
false
;
this
.
isLoading
=
false
;
// eslint-disable-next-line no-new
new
Flash
(
'
An error occurred while fetching the environments.
'
,
'
alert
'
);
new
Flash
(
'
An error occurred while fetching the environments.
'
,
'
alert
'
);
});
});
},
},
...
@@ -169,7 +169,7 @@ export default {
...
@@ -169,7 +169,7 @@ export default {
:environments=
"state.environments"
:environments=
"state.environments"
:can-create-deployment=
"canCreateDeploymentParsed"
:can-create-deployment=
"canCreateDeploymentParsed"
:can-read-environment=
"canReadEnvironmentParsed"
:can-read-environment=
"canReadEnvironmentParsed"
:service=
"service"
/>
/>
<table-pagination
<table-pagination
v-if=
"state.paginationInformation && state.paginationInformation.totalPages > 1"
v-if=
"state.paginationInformation && state.paginationInformation.totalPages > 1"
...
...
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