Skip to content

G
gitlab-ce
Commit bbd0c488 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

fix conflicts for 

  app/assets/javascripts/environments/components/environment_item.vue
  app/assets/javascripts/environments/components/environment_actions.vue
[ci skip]
parent d4aa2fd2
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 188 deletions
app/assets/javascripts/environments/components/environment_actions.vue
View file @ bbd0c488
...@@ -12,10 +12,6 @@ ...@@ -12,10 +12,6 @@
components: { components: {
loadingIcon, loadingIcon,
}, },
<<<<<<< HEAD
=======
>>>>>>> upstream/master
props: { props: {
actions: { actions: {
type: Array, type: Array,
......
app/assets/javascripts/environments/components/environment_item.vue
View file @ bbd0c488
...@@ -53,21 +53,12 @@ ...@@ -53,21 +53,12 @@
computed: { computed: {
/** /**
<<<<<<< HEAD
* Verifies if `last_deployment` key exists in the current Environment.
* This key is required to render most of the html - this method works has
* an helper.
*
* @returns {Boolean}
*/
=======
* Verifies if `last_deployment` key exists in the current Envrionment. * Verifies if `last_deployment` key exists in the current Envrionment.
* This key is required to render most of the html - this method works has * This key is required to render most of the html - this method works has
* an helper. * an helper.
* *
* @returns {Boolean} * @returns {Boolean}
*/ */
>>>>>>> upstream/master
hasLastDeploymentKey() { hasLastDeploymentKey() {
if (this.model && if (this.model &&
this.model.last_deployment && this.model.last_deployment &&
...@@ -78,19 +69,11 @@ ...@@ -78,19 +69,11 @@
}, },
/** /**
<<<<<<< HEAD
* Verifies is the given environment has manual actions.
* Used to verify if we should render them or nor.
*
* @returns {Boolean|Undefined}
*/
=======
* Verifies is the given environment has manual actions. * Verifies is the given environment has manual actions.
* Used to verify if we should render them or nor. * Used to verify if we should render them or nor.
* *
* @returns {Boolean|Undefined} * @returns {Boolean|Undefined}
*/ */
>>>>>>> upstream/master
hasManualActions() { hasManualActions() {
return this.model && return this.model &&
this.model.last_deployment && this.model.last_deployment &&
...@@ -99,35 +82,20 @@ ...@@ -99,35 +82,20 @@
}, },
/** /**
<<<<<<< HEAD
* Returns the value of the `stop_action?` key provided in the response.
*
* @returns {Boolean}
*/
=======
* Returns the value of the `stop_action?` key provided in the response. * Returns the value of the `stop_action?` key provided in the response.
* *
* @returns {Boolean} * @returns {Boolean}
*/ */
>>>>>>> upstream/master
hasStopAction() { hasStopAction() {
return this.model && this.model['stop_action?']; return this.model && this.model['stop_action?'];
}, },
/** /**
<<<<<<< HEAD
* Verifies if the `deployable` key is present in `last_deployment` key.
* Used to verify whether we should or not render the rollback partial.
*
* @returns {Boolean|Undefined}
*/
=======
* Verifies if the `deployable` key is present in `last_deployment` key. * Verifies if the `deployable` key is present in `last_deployment` key.
* Used to verify whether we should or not render the rollback partial. * Used to verify whether we should or not render the rollback partial.
* *
* @returns {Boolean|Undefined} * @returns {Boolean|Undefined}
*/ */
>>>>>>> upstream/master
canRetry() { canRetry() {
return this.model && return this.model &&
this.hasLastDeploymentKey && this.hasLastDeploymentKey &&
...@@ -136,17 +104,10 @@ ...@@ -136,17 +104,10 @@
}, },
/** /**
<<<<<<< HEAD
* Verifies if the date to be shown is present.
*
* @returns {Boolean|Undefined}
*/
=======
* Verifies if the date to be shown is present. * Verifies if the date to be shown is present.
* *
* @returns {Boolean|Undefined} * @returns {Boolean|Undefined}
*/ */
>>>>>>> upstream/master
canShowDate() { canShowDate() {
return this.model && return this.model &&
this.model.last_deployment && this.model.last_deployment &&
...@@ -155,17 +116,10 @@ ...@@ -155,17 +116,10 @@
}, },
/** /**
<<<<<<< HEAD
* Human readable date.
*
* @returns {String}
*/
=======
* Human readable date. * Human readable date.
* *
* @returns {String} * @returns {String}
*/ */
>>>>>>> upstream/master
createdDate() { createdDate() {
if (this.model && if (this.model &&
this.model.last_deployment && this.model.last_deployment &&
...@@ -177,17 +131,10 @@ ...@@ -177,17 +131,10 @@
}, },
/** /**
<<<<<<< HEAD
* Returns the manual actions with the name parsed.
*
* @returns {Array.<Object>|Undefined}
*/
=======
* Returns the manual actions with the name parsed. * Returns the manual actions with the name parsed.
* *
* @returns {Array.<Object>|Undefined} * @returns {Array.<Object>|Undefined}
*/ */
>>>>>>> upstream/master
manualActions() { manualActions() {
if (this.hasManualActions) { if (this.hasManualActions) {
return this.model.last_deployment.manual_actions.map((action) => { return this.model.last_deployment.manual_actions.map((action) => {
...@@ -203,17 +150,10 @@ ...@@ -203,17 +150,10 @@
}, },
/** /**
<<<<<<< HEAD
* Builds the string used in the user image alt attribute.
*
* @returns {String}
*/
=======
* Builds the string used in the user image alt attribute. * Builds the string used in the user image alt attribute.
* *
* @returns {String} * @returns {String}
*/ */
>>>>>>> upstream/master
userImageAltDescription() { userImageAltDescription() {
if (this.model && if (this.model &&
this.model.last_deployment && this.model.last_deployment &&
...@@ -225,17 +165,10 @@ ...@@ -225,17 +165,10 @@
}, },
/** /**
<<<<<<< HEAD
* If provided, returns the commit tag.
*
* @returns {String|Undefined}
*/
=======
* If provided, returns the commit tag. * If provided, returns the commit tag.
* *
* @returns {String|Undefined} * @returns {String|Undefined}
*/ */
>>>>>>> upstream/master
commitTag() { commitTag() {
if (this.model && if (this.model &&
this.model.last_deployment && this.model.last_deployment &&
...@@ -246,17 +179,10 @@ ...@@ -246,17 +179,10 @@
}, },
/** /**
<<<<<<< HEAD
* If provided, returns the commit ref.
*
* @returns {Object|Undefined}
*/
=======
* If provided, returns the commit ref. * If provided, returns the commit ref.
* *
* @returns {Object|Undefined} * @returns {Object|Undefined}
*/ */
>>>>>>> upstream/master
commitRef() { commitRef() {
if (this.model && if (this.model &&
this.model.last_deployment && this.model.last_deployment &&
...@@ -267,17 +193,10 @@ ...@@ -267,17 +193,10 @@
}, },
/** /**
<<<<<<< HEAD
* If provided, returns the commit url.
*
* @returns {String|Undefined}
*/
=======
* If provided, returns the commit url. * If provided, returns the commit url.
* *
* @returns {String|Undefined} * @returns {String|Undefined}
*/ */
>>>>>>> upstream/master
commitUrl() { commitUrl() {
if (this.model && if (this.model &&
this.model.last_deployment && this.model.last_deployment &&
...@@ -289,17 +208,10 @@ ...@@ -289,17 +208,10 @@
}, },
/** /**
<<<<<<< HEAD
* If provided, returns the commit short sha.
*
* @returns {String|Undefined}
*/
=======
* If provided, returns the commit short sha. * If provided, returns the commit short sha.
* *
* @returns {String|Undefined} * @returns {String|Undefined}
*/ */
>>>>>>> upstream/master
commitShortSha() { commitShortSha() {
if (this.model && if (this.model &&
this.model.last_deployment && this.model.last_deployment &&
...@@ -311,17 +223,10 @@ ...@@ -311,17 +223,10 @@
}, },
/** /**
<<<<<<< HEAD
* If provided, returns the commit title.
*
* @returns {String|Undefined}
*/
=======
* If provided, returns the commit title. * If provided, returns the commit title.
* *
* @returns {String|Undefined} * @returns {String|Undefined}
*/ */
>>>>>>> upstream/master
commitTitle() { commitTitle() {
if (this.model && if (this.model &&
this.model.last_deployment && this.model.last_deployment &&
...@@ -333,17 +238,10 @@ ...@@ -333,17 +238,10 @@
}, },
/** /**
<<<<<<< HEAD
* If provided, returns the commit tag.
*
* @returns {Object|Undefined}
*/
=======
* If provided, returns the commit tag. * If provided, returns the commit tag.
* *
* @returns {Object|Undefined} * @returns {Object|Undefined}
*/ */
>>>>>>> upstream/master
commitAuthor() { commitAuthor() {
if (this.model && if (this.model &&
this.model.last_deployment && this.model.last_deployment &&
...@@ -356,17 +254,10 @@ ...@@ -356,17 +254,10 @@
}, },
/** /**
<<<<<<< HEAD
* Verifies if the `retry_path` key is present and returns its value.
*
* @returns {String|Undefined}
*/
=======
* Verifies if the `retry_path` key is present and returns its value. * Verifies if the `retry_path` key is present and returns its value.
* *
* @returns {String|Undefined} * @returns {String|Undefined}
*/ */
>>>>>>> upstream/master
retryUrl() { retryUrl() {
if (this.model && if (this.model &&
this.model.last_deployment && this.model.last_deployment &&
...@@ -378,60 +269,35 @@ ...@@ -378,60 +269,35 @@
}, },
/** /**
<<<<<<< HEAD
* Verifies if the `last?` key is present and returns its value.
*
* @returns {Boolean|Undefined}
*/
=======
* Verifies if the `last?` key is present and returns its value. * Verifies if the `last?` key is present and returns its value.
* *
* @returns {Boolean|Undefined} * @returns {Boolean|Undefined}
*/ */
>>>>>>> upstream/master
isLastDeployment() { isLastDeployment() {
return this.model && this.model.last_deployment && return this.model && this.model.last_deployment &&
this.model.last_deployment['last?']; this.model.last_deployment['last?'];
}, },
/** /**
<<<<<<< HEAD
* Builds the name of the builds needed to display both the name and the id.
*
* @returns {String}
*/
=======
* Builds the name of the builds needed to display both the name and the id. * Builds the name of the builds needed to display both the name and the id.
* *
* @returns {String} * @returns {String}
*/ */
>>>>>>> upstream/master
buildName() { buildName() {
if (this.model && if (this.model &&
this.model.last_deployment && this.model.last_deployment &&
this.model.last_deployment.deployable) { this.model.last_deployment.deployable) {
<<<<<<< HEAD
return `${this.model.last_deployment.deployable.name} #${this.model.last_deployment.deployable.id}`;
=======
const deployable = this.model.last_deployment.deployable; const deployable = this.model.last_deployment.deployable;
return `${deployable.name} #${deployable.id}`; return `${deployable.name} #${deployable.id}`;
>>>>>>> upstream/master
} }
return ''; return '';
}, },
/** /**
<<<<<<< HEAD
* Builds the needed string to show the internal id.
*
* @returns {String}
*/
=======
* Builds the needed string to show the internal id. * Builds the needed string to show the internal id.
* *
* @returns {String} * @returns {String}
*/ */
>>>>>>> upstream/master
deploymentInternalId() { deploymentInternalId() {
if (this.model && if (this.model &&
this.model.last_deployment && this.model.last_deployment &&
...@@ -442,17 +308,10 @@ ...@@ -442,17 +308,10 @@
}, },
/** /**
<<<<<<< HEAD
* Verifies if the user object is present under last_deployment object.
*
* @returns {Boolean}
*/
=======
* Verifies if the user object is present under last_deployment object. * Verifies if the user object is present under last_deployment object.
* *
* @returns {Boolean} * @returns {Boolean}
*/ */
>>>>>>> upstream/master
deploymentHasUser() { deploymentHasUser() {
return this.model && return this.model &&
!_.isEmpty(this.model.last_deployment) && !_.isEmpty(this.model.last_deployment) &&
...@@ -460,19 +319,11 @@ ...@@ -460,19 +319,11 @@
}, },
/** /**
<<<<<<< HEAD
* Returns the user object nested with the last_deployment object.
* Used to render the template.
*
* @returns {Object}
*/
=======
* Returns the user object nested with the last_deployment object. * Returns the user object nested with the last_deployment object.
* Used to render the template. * Used to render the template.
* *
* @returns {Object} * @returns {Object}
*/ */
>>>>>>> upstream/master
deploymentUser() { deploymentUser() {
if (this.model && if (this.model &&
!_.isEmpty(this.model.last_deployment) && !_.isEmpty(this.model.last_deployment) &&
...@@ -483,21 +334,12 @@ ...@@ -483,21 +334,12 @@
}, },
/** /**
<<<<<<< HEAD
* Verifies if the build name column should be rendered by verifing
* if all the information needed is present
* and if the environment is not a folder.
*
* @returns {Boolean}
*/
=======
* Verifies if the build name column should be rendered by verifing * Verifies if the build name column should be rendered by verifing
* if all the information needed is present * if all the information needed is present
* and if the environment is not a folder. * and if the environment is not a folder.
* *
* @returns {Boolean} * @returns {Boolean}
*/ */
>>>>>>> upstream/master
shouldRenderBuildName() { shouldRenderBuildName() {
return !this.model.isFolder && return !this.model.isFolder &&
!_.isEmpty(this.model.last_deployment) && !_.isEmpty(this.model.last_deployment) &&
...@@ -505,17 +347,10 @@ ...@@ -505,17 +347,10 @@
}, },
/** /**
<<<<<<< HEAD
* Verifies the presence of all the keys needed to render the buil_path.
*
* @return {String}
*/
=======
* Verifies the presence of all the keys needed to render the buil_path. * Verifies the presence of all the keys needed to render the buil_path.
* *
* @return {String} * @return {String}
*/ */
>>>>>>> upstream/master
buildPath() { buildPath() {
if (this.model && if (this.model &&
this.model.last_deployment && this.model.last_deployment &&
...@@ -528,17 +363,10 @@ ...@@ -528,17 +363,10 @@
}, },
/** /**
<<<<<<< HEAD
* Verifies the presence of all the keys needed to render the external_url.
*
* @return {String}
*/
=======
* Verifies the presence of all the keys needed to render the external_url. * Verifies the presence of all the keys needed to render the external_url.
* *
* @return {String} * @return {String}
*/ */
>>>>>>> upstream/master
externalURL() { externalURL() {
if (this.model && this.model.external_url) { if (this.model && this.model.external_url) {
return this.model.external_url; return this.model.external_url;
...@@ -548,21 +376,12 @@ ...@@ -548,21 +376,12 @@
}, },
/** /**
<<<<<<< HEAD
* Verifies if deplyment internal ID should be rendered by verifing
* if all the information needed is present
* and if the environment is not a folder.
*
* @returns {Boolean}
*/
=======
* Verifies if deplyment internal ID should be rendered by verifing * Verifies if deplyment internal ID should be rendered by verifing
* if all the information needed is present * if all the information needed is present
* and if the environment is not a folder. * and if the environment is not a folder.
* *
* @returns {Boolean} * @returns {Boolean}
*/ */
>>>>>>> upstream/master
shouldRenderDeploymentID() { shouldRenderDeploymentID() {
return !this.model.isFolder && return !this.model.isFolder &&
!_.isEmpty(this.model.last_deployment) && !_.isEmpty(this.model.last_deployment) &&
...@@ -598,12 +417,9 @@ ...@@ -598,12 +417,9 @@
onClickFolder() { onClickFolder() {
eventHub.$emit('toggleFolder', this.model); eventHub.$emit('toggleFolder', this.model);
}, },
<<<<<<< HEAD
toggleDeployBoard() { toggleDeployBoard() {
eventHub.$emit('toggleDeployBoard', this.model); eventHub.$emit('toggleDeployBoard', this.model);
}, },
=======
>>>>>>> upstream/master
}, },
}; };
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7