Add latest changes from gitlab-org/gitlab@master

4 files changed, 2 insertions, 19 deletions

diff --git a/app/views/projects/triggers/_content.html.haml b/app/views/projects/triggers/_content.html.haml
deleted file mode 100644
index e686068657c..00000000000
--- a/app/views/projects/triggers/_content.html.haml
+++ /dev/null
@@ -1,9 +0,0 @@
-- if Feature.enabled?(:use_legacy_pipeline_triggers, @project)
-  %p.append-bottom-default
-    Triggers with the
-    %span.badge.badge-primary legacy
-    label do not have an associated user and only have access to the current project.
-    %br
-    = succeed '.' do
-      Learn more in the
-      = link_to 'triggers documentation', help_page_path('ci/triggers/README'), target: '_blank'
diff --git a/app/views/projects/triggers/_index.html.haml b/app/views/projects/triggers/_index.html.haml
index a559ce41e57..55a9234f01a 100644
--- a/app/views/projects/triggers/_index.html.haml
+++ b/app/views/projects/triggers/_index.html.haml
@@ -1,6 +1,5 @@
 .row.prepend-top-default.append-bottom-default.triggers-container
   .col-lg-12
-    = render "projects/triggers/content"
     .card
       .card-header
         Manage your project's triggers
diff --git a/app/views/projects/triggers/_trigger.html.haml b/app/views/projects/triggers/_trigger.html.haml
index 60de3630bb5..d80248f7e80 100644
--- a/app/views/projects/triggers/_trigger.html.haml
+++ b/app/views/projects/triggers/_trigger.html.haml
@@ -7,12 +7,7 @@
       %span= trigger.short_token
 
     .label-container
-      - if trigger.legacy?
-        - if trigger.supports_legacy_tokens?
-          %span.badge.badge-primary.has-tooltip{ title: "Trigger makes use of deprecated functionality" } legacy
-        - else
-          %span.badge.badge-danger.has-tooltip{ title: "Trigger is invalid due to being a legacy trigger. We recommend replacing it with a new trigger" } invalid
-      - elsif !trigger.can_access_project?
+      - unless trigger.can_access_project?
         %span.badge.badge-danger.has-tooltip{ title: "Trigger user has insufficient permissions to project" } invalid
 
   %td
diff --git a/app/views/projects/triggers/edit.html.haml b/app/views/projects/triggers/edit.html.haml
index c35df322b9d..0f74d733c06 100644
--- a/app/views/projects/triggers/edit.html.haml
+++ b/app/views/projects/triggers/edit.html.haml
@@ -1,9 +1,7 @@
 - page_title "Trigger"
 
 .row.prepend-top-default.append-bottom-default
-  .col-lg-3
-    = render "content"
-  .col-lg-9
+  .col-lg-12
     %h4.prepend-top-0
       Update trigger
     = render "form", btn_text: "Save trigger"