Add latest changes from gitlab-org/gitlab@master

10 files changed, 44 insertions, 46 deletions

diff --git a/app/views/admin/dev_ops_report/show.html.haml b/app/views/admin/dev_ops_report/show.html.haml
index 75398f3aa21..19ce285162f 100644
--- a/app/views/admin/dev_ops_report/show.html.haml
+++ b/app/views/admin/dev_ops_report/show.html.haml
@@ -3,7 +3,7 @@
 
 .container
   .gl-mt-3
-    - if Gitlab.ee? && Feature.enabled?(:devops_adoption_feature, default_enabled: true) && License.feature_available?(:devops_adoption)
+    - if Gitlab.ee? && License.feature_available?(:devops_adoption)
       = render_if_exists 'admin/dev_ops_report/devops_tabs'
     - else
       = render 'report'
diff --git a/app/views/jira_connect/subscriptions/index.html.haml b/app/views/jira_connect/subscriptions/index.html.haml
index b826a1b6fc6..90a92f5c6d5 100644
--- a/app/views/jira_connect/subscriptions/index.html.haml
+++ b/app/views/jira_connect/subscriptions/index.html.haml
@@ -23,15 +23,16 @@
   - else
     .js-jira-connect-app
 
-    %form#add-subscription-form.subscription-form{ action: jira_connect_subscriptions_path }
-      .ak-field-group
-        %label
-          GitLab namespace
+    - unless new_jira_connect_ui?
+      %form#add-subscription-form.subscription-form{ action: jira_connect_subscriptions_path }
+        .ak-field-group
+          %label
+            GitLab namespace
 
-      .ak-field-group.field-group-input
-        %input#namespace-input.ak-field-text{ type: 'text', required: true, placeholder: 'e.g. "MyCompany" or "MyCompany/GroupName"' }
-        %button.ak-button.ak-button__appearance-primary{ type: 'submit' }
-          Link namespace to Jira
+        .ak-field-group.field-group-input
+          %input#namespace-input.ak-field-text{ type: 'text', required: true, placeholder: 'e.g. "MyCompany" or "MyCompany/GroupName"' }
+          %button.ak-button.ak-button__appearance-primary{ type: 'submit' }
+            Link namespace to Jira
 
     - if @subscriptions.present?
       %table.subscriptions
@@ -49,6 +50,7 @@
     - else
       %h4.empty-subscriptions
         No linked namespaces
+      %p= s_('Integrations|Namespaces are your GitLab groups and subgroups that will be linked to this Jira instance.')
 
   %p.browser-limitations-notice
     %strong Browser limitations:
diff --git a/app/views/layouts/jira_connect.html.haml b/app/views/layouts/jira_connect.html.haml
index 0d4ecfc5a10..d996b3387a3 100644
--- a/app/views/layouts/jira_connect.html.haml
+++ b/app/views/layouts/jira_connect.html.haml
@@ -3,8 +3,9 @@
     %meta{ content: "text/html; charset=utf-8", "http-equiv" => "Content-Type" }
     %title
       GitLab
-    = stylesheet_link_tag 'https://unpkg.com/@atlaskit/css-reset@3.0.6/dist/bundle.css'
-    = stylesheet_link_tag 'https://unpkg.com/@atlaskit/reduced-ui-pack@10.5.5/dist/bundle.css'
+    - unless new_jira_connect_ui?
+      = stylesheet_link_tag 'https://unpkg.com/@atlaskit/css-reset@3.0.6/dist/bundle.css'
+      = stylesheet_link_tag 'https://unpkg.com/@atlaskit/reduced-ui-pack@10.5.5/dist/bundle.css'
     = yield :page_specific_styles
 
     = javascript_include_tag 'https://connect-cdn.atl-paas.net/all.js'
diff --git a/app/views/projects/protected_tags/shared/_create_protected_tag.html.haml b/app/views/projects/protected_tags/shared/_create_protected_tag.html.haml
index c4bf2d20ecf..4d00762760e 100644
--- a/app/views/projects/protected_tags/shared/_create_protected_tag.html.haml
+++ b/app/views/projects/protected_tags/shared/_create_protected_tag.html.haml
@@ -16,7 +16,7 @@
             %code v*
             or
             %code *-release
-            are supported
+            are supported.
       .form-group.row
         %label.col-md-2.text-right{ for: 'create_access_levels_attributes' }
           Allowed to create:
diff --git a/app/views/projects/protected_tags/shared/_index.html.haml b/app/views/projects/protected_tags/shared/_index.html.haml
index 4bf3ce09fc7..5734b7dc3c9 100644
--- a/app/views/projects/protected_tags/shared/_index.html.haml
+++ b/app/views/projects/protected_tags/shared/_index.html.haml
@@ -7,16 +7,14 @@
     %button.btn.js-settings-toggle{ type: 'button' }
       = expanded ? 'Collapse' : 'Expand'
     %p
-      Limit access to creating and updating tags.
+      Limit access to creating and updating tags. #{link_to "What are protected tags?", help_page_path("user/project/protected_tags")}
   .settings-content
     %p
-      By default, protected tags are designed to:
+      By default, protected tags protect your code and:
       %ul
-        %li Prevent tag creation by everybody except Maintainers
-        %li Prevent <strong>anyone</strong> from updating the tag
-        %li Prevent <strong>anyone</strong> from deleting the tag
-
-    %p Read more about #{link_to "protected tags", help_page_path("user/project/protected_tags")}.
+        %li Allow only users with Maintainer #{link_to "permissions", help_page_path("user/permissions")} to create tags.
+        %li Prevent <strong>anyone</strong> from updating tags.
+        %li Prevent <strong>anyone</strong> from deleting tags.
 
     - if can? current_user, :admin_project, @project
       = yield :create_protected_tag
diff --git a/app/views/projects/protected_tags/shared/_tags_list.html.haml b/app/views/projects/protected_tags/shared/_tags_list.html.haml
index 382ea848243..a5a43072744 100644
--- a/app/views/projects/protected_tags/shared/_tags_list.html.haml
+++ b/app/views/projects/protected_tags/shared/_tags_list.html.haml
@@ -1,9 +1,9 @@
 .protected-tags-list.js-protected-tags-list
   - if @protected_tags.empty?
     .card-header
-      Protected tag (#{@protected_tags_count})
+      Protected tags (#{@protected_tags_count})
     %p.settings-message.text-center
-      There are currently no protected tags, protect a tag with the form above.
+      No tags are protected.
   - else
     - can_admin_project = can?(current_user, :admin_project, @project)
 
@@ -16,7 +16,7 @@
           %col
       %thead
         %tr
-          %th Protected tag (#{@protected_tags_count})
+          %th Protected tags (#{@protected_tags_count})
           %th Last commit
           %th Allowed to create
           - if can_admin_project
diff --git a/app/views/shared/wikis/diff.html.haml b/app/views/shared/wikis/diff.html.haml
index 68bbbd66f4a..19167f04855 100644
--- a/app/views/shared/wikis/diff.html.haml
+++ b/app/views/shared/wikis/diff.html.haml
@@ -5,12 +5,11 @@
 .wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
   = wiki_sidebar_toggle_button
 
-  .nav-text
-    %h2.wiki-page-title
-      = link_to_wiki_page @page
-      %span.light
-        &middot;
-        = _('Changes')
+  %h3.page-title.gl-flex-fill-1
+    = link_to_wiki_page @page
+    %span.light
+      &middot;
+      = _('Changes')
 
   .nav-controls.pb-md-3.pb-lg-0
     = link_to wiki_page_path(@wiki, @page, action: :history), class: 'btn gl-button', role: 'button', data: { qa_selector: 'page_history_button' } do
diff --git a/app/views/shared/wikis/edit.html.haml b/app/views/shared/wikis/edit.html.haml
index b289c018015..c2b0e474c03 100644
--- a/app/views/shared/wikis/edit.html.haml
+++ b/app/views/shared/wikis/edit.html.haml
@@ -6,15 +6,14 @@
 .wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
   = wiki_sidebar_toggle_button
 
-  .nav-text
-    %h2.wiki-page-title
-      - if @page.persisted?
-        = link_to_wiki_page @page
-        %span.light
-          &middot;
-          = s_("Wiki|Edit Page")
-      - else
-        = s_("Wiki|Create New Page")
+  %h3.page-title.gl-flex-fill-1
+    - if @page.persisted?
+      = link_to_wiki_page @page
+      %span.light
+        &middot;
+        = s_("Wiki|Edit Page")
+    - else
+      = s_("Wiki|Create New Page")
 
   .nav-controls.pb-md-3.pb-lg-0
     - if @page.persisted?
diff --git a/app/views/shared/wikis/history.html.haml b/app/views/shared/wikis/history.html.haml
index 50ccfdeabd5..b1dcd2cd400 100644
--- a/app/views/shared/wikis/history.html.haml
+++ b/app/views/shared/wikis/history.html.haml
@@ -4,12 +4,11 @@
 .wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
   = wiki_sidebar_toggle_button
 
-  .nav-text
-    %h2.wiki-page-title
-      = link_to_wiki_page @page
-      %span.light
-        &middot;
-        = _('History')
+  %h3.page-title
+    = link_to_wiki_page @page
+    %span.light
+      &middot;
+      = _('History')
 
 .prepend-top-default.gl-mb-3
   .table-holder
diff --git a/app/views/shared/wikis/pages.html.haml b/app/views/shared/wikis/pages.html.haml
index 76fc9510740..f5ba1c83de4 100644
--- a/app/views/shared/wikis/pages.html.haml
+++ b/app/views/shared/wikis/pages.html.haml
@@ -6,9 +6,9 @@
 
 .wiki-page-header.top-area.flex-column.flex-lg-row
 
-  .nav-text.flex-fill
-    %h2.wiki-page-title
-      = s_("Wiki|Wiki Pages")
+
+  %h3.page-title.gl-flex-fill-1
+    = s_("Wiki|Wiki Pages")
 
   .nav-controls.pb-md-3.pb-lg-0
     = link_to wiki_path(@wiki, action: :git_access), class: 'btn gl-button' do