Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/ci_settings_pipeline_triggers/components/triggers_list.vue

@@ -1,5 +1,13 @@
 <script>
-import { GlTable, GlButton, GlBadge, GlTooltipDirective, GlAvatarLink, GlAvatar } from '@gitlab/ui';
+import {
+  GlAlert,
+  GlAvatar,
+  GlAvatarLink,
+  GlBadge,
+  GlButton,
+  GlTable,
+  GlTooltipDirective,
+} from '@gitlab/ui';
 import { s__ } from '~/locale';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
@@ -15,14 +23,15 @@ export default {
     ),
   },
   components: {
-    GlTable,
-    GlButton,
-    GlBadge,
     ClipboardButton,
-    TooltipOnTruncate,
-    GlAvatarLink,
+    GlAlert,
     GlAvatar,
+    GlAvatarLink,
+    GlBadge,
+    GlButton,
+    GlTable,
     TimeAgoTooltip,
+    TooltipOnTruncate,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -138,13 +147,15 @@ export default {
         />
       </template>
     </gl-table>
-    <div
+    <gl-alert
       v-else
+      variant="warning"
+      :dismissible="false"
+      :show-icon="false"
       data-testid="no_triggers_content"
       data-qa-selector="no_triggers_content"
-      class="settings-message gl-text-center gl-mb-3"
     >
       {{ s__('Pipelines|No triggers have been created yet. Add one using the form above.') }}
-    </div>
+    </gl-alert>
   </div>
 </template>

app/views/projects/deployments/_deployment.html.haml

@@ -23,7 +23,7 @@
     - if deployment.deployable
       .table-mobile-content
         .flex-truncate-parent
-          .flex-truncate-child
+          .flex-truncate-child.has-tooltip.gl-white-space-normal.gl-md-white-space-nowrap{ :title => "#{deployment.deployable.name} (##{deployment.deployable.id})", data: { container: 'body' } }
             = link_to deployment_path(deployment), class: 'build-link' do
               #{deployment.deployable.name} (##{deployment.deployable.id})
     - else

app/views/projects/triggers/_index.html.haml

@@ -5,7 +5,7 @@
         = _("Manage your project's triggers")
       - c.body do
         = render 'projects/triggers/form', btn_text: _('Add trigger')
-        %hr
+        .gl-mb-5
         - if Feature.enabled?(:ci_pipeline_triggers_settings_vue_ui, @project)
           #js-ci-pipeline-triggers-list.triggers-list{ data: { triggers: @triggers_json } }
         - else
@@ -28,8 +28,10 @@
                   %th
                 = render partial: 'projects/triggers/trigger', collection: @triggers, as: :trigger
           - else
-            %p.settings-message.text-center.gl-mb-3{ data: { testid: 'no_triggers_content' } }
-              = _('No triggers exist yet. Use the form above to create one.')
+            = render Pajamas::AlertComponent.new(variant: :warning, show_icon: false, dismissible: false,
+              alert_options: { data: { testid: 'no_triggers_content' }}) do |c|
+              = c.body do
+                = _('No triggers exist yet. Use the form above to create one.')
       - c.footer do
         %p
           = _("These examples show how to trigger this project's pipeline for a branch or tag.")

spec/features/projects/environments/environment_spec.rb

@@ -97,6 +97,10 @@ RSpec.describe 'Environment' do
         it 'does show deployments' do
           expect(page).to have_link("#{build.name} (##{build.id})")
         end
+
+        it 'shows a tooltip on the job name' do
+          expect(page).to have_css("[title=\"#{build.name} (##{build.id})\"].has-tooltip")
+        end
       end
 
       context 'when there is a failed deployment' do