diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-28 09:54:12 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-28 09:54:12 +0000 |
| commit | 6862e788e8b32196d750152c4657ea95d431e04f (patch) | |
| tree | b84746c1943e39ab6540954263b7fef4c4248d51 /app/assets/javascripts/environments | |
| parent | 61f65992a05e8fc5ab756ac0ce890d090c6cf4eb (diff) | |
| parent | 7733f285aca97d444382a59eda0ea3e303539c26 (diff) | |
| download | gitlab-ce-6862e788e8b32196d750152c4657ea95d431e04f.tar.gz | |
Merge branch 'master' into add-svg-loader
* master:
Fix migration without DOWNTIME clause specified
Fix CSS classes
fix missing @ symbol
Update CHANGELOG.md for 8.16.7
Update CHANGELOG.md for 8.16.7
Update CHANGELOG.md for 8.16.7
Make RuboCop happy
Add development fixtures for nested groups
Align last column buttons with new environment button
Removed jQuery UI draggable
ensure webpack dev server proxy connects regardless of request headers
Keep consistent in handling indexOf results
Replace setInterval with setTimeout to prevent highly frequent requests
Add feature specs for three types of user uploads
Minor refactoring of Uploaders
Fix #27840 - Improve the search bar experience on mobile
Fix false positive caused by non-interpolated string use
Fix inline comment images by removing wrapper #20890
Diffstat (limited to 'app/assets/javascripts/environments')
| -rw-r--r-- | app/assets/javascripts/environments/components/environment_item.js.es6 | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6 index 6a91982ffa7..08579d0e826 100644 --- a/app/assets/javascripts/environments/components/environment_item.js.es6 +++ b/app/assets/javascripts/environments/components/environment_item.js.es6 @@ -486,25 +486,23 @@ module.exports = Vue.component('environment-item', { </span> </td> - <td class="hidden-xs"> - <div v-if="!model.isFolder"> - <div class="btn-group" role="group"> - <actions-component v-if="hasManualActions && canCreateDeployment" - :actions="manualActions"/> + <td class="hidden-xs environments-actions"> + <div v-if="!model.isFolder" class="btn-group" role="group"> + <actions-component v-if="hasManualActions && canCreateDeployment" + :actions="manualActions"/> - <external-url-component v-if="externalURL && canReadEnvironment" - :external-url="externalURL"/> + <external-url-component v-if="externalURL && canReadEnvironment" + :external-url="externalURL"/> - <stop-component v-if="hasStopAction && canCreateDeployment" - :stop-url="model.stop_path"/> + <stop-component v-if="hasStopAction && canCreateDeployment" + :stop-url="model.stop_path"/> - <terminal-button-component v-if="model && model.terminal_path" - :terminal-path="model.terminal_path"/> + <terminal-button-component v-if="model && model.terminal_path" + :terminal-path="model.terminal_path"/> - <rollback-component v-if="canRetry && canCreateDeployment" - :is-last-deployment="isLastDeployment" - :retry-url="retryUrl"/> - </div> + <rollback-component v-if="canRetry && canCreateDeployment" + :is-last-deployment="isLastDeployment" + :retry-url="retryUrl"/> </div> </td> </tr> |