diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-10-09 17:34:48 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-10-09 17:34:48 +0300 |
| commit | cf7aea84f37d33400ef6e5716e234dc5dc735146 (patch) | |
| tree | b24c1eba71e4e4b56c04fb9436ffb64803387a2f /app | |
| parent | 5dc20e505d259345aa2a3f4049a59abe75cbc301 (diff) | |
| parent | 0275069cc0ecce232bd0c9e383ac5dcf086f2400 (diff) | |
Merge branch 'qa-304-auto-devops-open-live-environment' into 'master'
Assert prod environment is live after Auto Devops
See merge request gitlab-org/gitlab-ce!22131
Diffstat (limited to 'app')
3 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/environments/components/environment_item.vue b/app/assets/javascripts/environments/components/environment_item.vue index a1d8e531940..ad5d16874f3 100644 --- a/app/assets/javascripts/environments/components/environment_item.vue +++ b/app/assets/javascripts/environments/components/environment_item.vue @@ -482,6 +482,7 @@ export default { v-if="!model.isFolder" class="environment-name table-mobile-content"> <a + class="qa-environment-link" :href="environmentPath" > {{ model.name }} diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index 25cd53b378a..48025f9bd20 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -216,7 +216,7 @@ = _('Metrics') = nav_link(controller: :environments, action: [:index, :folder, :show, :new, :edit, :create, :update, :stop, :terminal]) do - = link_to project_environments_path(@project), title: _('Environments'), class: 'shortcuts-environments' do + = link_to project_environments_path(@project), title: _('Environments'), class: 'shortcuts-environments qa-operations-environments-link' do %span = _('Environments') diff --git a/app/views/projects/environments/_external_url.html.haml b/app/views/projects/environments/_external_url.html.haml index 4694bc39d54..b3a82d1ef41 100644 --- a/app/views/projects/environments/_external_url.html.haml +++ b/app/views/projects/environments/_external_url.html.haml @@ -1,4 +1,4 @@ - if environment.external_url && can?(current_user, :read_environment, environment) - = link_to environment.external_url, target: '_blank', rel: 'noopener noreferrer', class: 'btn external-url has-tooltip', title: s_('Environments|Open live environment') do + = link_to environment.external_url, target: '_blank', rel: 'noopener noreferrer', class: 'btn external-url has-tooltip qa-view-deployment', title: s_('Environments|Open live environment') do = sprite_icon('external-link') View deployment |