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
7e793af3
Commit
7e793af3
authored
Aug 03, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
revert changes from gitlab-org/gitlab-ce!21018
parent
955e4e98
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
14 deletions
+2
-14
app/assets/javascripts/environments/components/environment_item.vue
.../javascripts/environments/components/environment_item.vue
+2
-14
No files found.
app/assets/javascripts/environments/components/environment_item.vue
View file @
7e793af3
...
@@ -86,18 +86,6 @@ export default {
...
@@ -86,18 +86,6 @@ export default {
);
);
},
},
/**
* Checkes whether the user is allowed to deploy to this environment.
* (`can_deploy` currently only set in EE)
*
* @returns {Boolean}
*/
isDeployableByUser
()
{
return
this
.
model
&&
'
can_deploy
'
in
this
.
model
?
this
.
model
.
can_deploy
:
this
.
canCreateDeployment
;
},
/**
/**
* Checkes whether the environment is protected.
* Checkes whether the environment is protected.
* (`is_protected` currently only set in EE)
* (`is_protected` currently only set in EE)
...
@@ -635,7 +623,7 @@ export default {
...
@@ -635,7 +623,7 @@ export default {
/>
/>
<actions-component
<actions-component
v-if=
"hasManualActions &&
isDeployableByUser
"
v-if=
"hasManualActions &&
canCreateDeployment
"
:actions=
"manualActions"
:actions=
"manualActions"
/>
/>
...
@@ -645,7 +633,7 @@ export default {
...
@@ -645,7 +633,7 @@ export default {
/>
/>
<rollback-component
<rollback-component
v-if=
"canRetry &&
isDeployableByUser
"
v-if=
"canRetry &&
canCreateDeployment
"
:is-last-deployment=
"isLastDeployment"
:is-last-deployment=
"isLastDeployment"
:retry-url=
"retryUrl"
:retry-url=
"retryUrl"
/>
/>
...
...
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