Add latest changes from gitlab-org/gitlab@master

app/views/shared/projects/_project.html.haml

@@ -12,7 +12,9 @@
 - css_class += " no-description" if project.description.blank? && !show_last_commit_as_description
 - cache_key = project_list_cache_key(project, pipeline_status: pipeline_status)
 - updated_tooltip = time_ago_with_tooltip(project.last_activity_date)
+- show_pipeline_status_icon = pipeline_status && can?(current_user, :read_cross_project) && project.pipeline_status.has_status? && can?(current_user, :read_build, project)
 - css_controls_class = compact_mode ? [] : ["flex-lg-row", "justify-content-lg-between"]
+- css_controls_class << "with-pipeline-status" if show_pipeline_status_icon
 - avatar_container_class = project.creator && use_creator_avatar ? '' : 'rect-avatar'
 - license_name = project_license_name(project)
@@ -61,6 +63,11 @@
       .controls.d-flex.flex-sm-column.align-items-center.align-items-sm-end.flex-wrap.flex-shrink-0.text-secondary{ class: css_controls_class.join(" ") }
         .icon-container.d-flex.align-items-center
+          - if show_pipeline_status_icon
+            - pipeline_path = pipelines_project_commit_path(project.pipeline_status.project, project.pipeline_status.sha, ref: project.pipeline_status.ref)
+            %span.icon-wrapper.pipeline-status
+              = render 'ci/status/icon', status: project.last_pipeline.detailed_status(current_user), tooltip_placement: 'top', path: pipeline_path
+
           = render_if_exists 'shared/projects/archived', project: project
           - if stars
             = link_to project_starrers_path(project),

changelogs/unreleased/195871-fix-duplicate-weight-change-notes.yml

+---
+title: Ensure weight changes no longer render duplicate system notes
+merge_request: 26014
+author:
+type: fixed

changelogs/unreleased/201999-formatter-column-chart.yml

+---
+title: Use y-axis format configuration in column charts
+merge_request: 26356
+author:
+type: changed

changelogs/unreleased/207462-scoped-labels-rendering-is-broken-in-todos.yml

+---
+title: Fix scoped labels rendering in To-Do List
+merge_request: 26146
+author:
+type: fixed

changelogs/unreleased/208242-scoped-label-rendering-in-emails-is-broken.yml

+---
+title: Fix scoped labels rendering in emails
+merge_request: 26347
+author:
+type: fixed

changelogs/unreleased/208471-actionview-template-error-undefined-method-concat-for-nil-nilclass.yml

+---
+title: Fix an error with concat method
+merge_request:
+author:
+type: fixed

changelogs/unreleased/208524-error-in-custom-dashboard-yml-file-breaks-the-dashboards-dropdown.yml

+---
+title: Fix dashboards dropdown if custom dashboard is broken
+merge_request: 26228
+author:
+type: fixed

changelogs/unreleased/63-nudge-users-to-select-a-template-to-set-up-a-pipeline.yml

+---
+title: Nudge users to select a gitlab-ci.yml template
+merge_request: 24622
+author:
+type: added

changelogs/unreleased/jswain_update_renewal_link.yml

+---
+title: Update renewal banner link for clearer instructions
+merge_request: 26240
+author:
+type: changed

changelogs/unreleased/leipert-polyfills-improvements.yml

+---
+title: Polyfill fetch for Internet Explorer 11
+merge_request: 26366
+author:
+type: fixed

changelogs/unreleased/revert-e0613e64.yml

+---
+title: Show CI status in project dashboards
+merge_request: 26403
+author:
+type: fixed

changelogs/unreleased/tokenize-filtered-search.yml

+---
+title: Use colon to tokenize input in filtered search
+merge_request: 26072
+author:
+type: changed

locale/gitlab.pot

@@ -484,6 +484,9 @@ msgstr ""
 msgid "%{title} changes"
 msgstr ""
+msgid "%{token}..."
+msgstr ""
+
 msgid "%{totalWeight} total weight"
 msgstr ""
@@ -1281,6 +1284,9 @@ msgstr ""
 msgid "Admin notes"
 msgstr ""
+msgid "AdminArea|Bots"
+msgstr ""
+
 msgid "AdminArea|Included Free in license"
 msgstr ""
@@ -24074,6 +24080,12 @@ msgstr ""
 msgid "success"
 msgstr ""
+msgid "suggestPipeline|1/2: Choose a template"
+msgstr ""
+
+msgid "suggestPipeline|We recommend the %{boldStart}Code Quality%{boldEnd} template, which will add a report widget to your Merge Requests. This way you’ll learn about code quality degradations much sooner. %{footerStart} Goodbye technical debt! %{footerEnd}"
+msgstr ""
+
 msgid "syntax is correct"
 msgstr ""

package.json

@@ -125,6 +125,7 @@
     "tiptap-commands": "^1.4.0",
     "tiptap-extensions": "^1.8.0",
     "underscore": "^1.9.0",
+    "unfetch": "^4.1.0",
     "url-loader": "^2.1.0",
     "visibilityjs": "^1.2.4",
     "vue": "^2.6.10",

spec/features/admin/admin_runners_spec.rb

@@ -57,7 +57,7 @@ describe "Admin Runners" do
           expect(page).to have_content 'runner-active'
           expect(page).to have_content 'runner-paused'
-          input_filtered_search_keys('status=active')
+          input_filtered_search_keys('status:=active')
           expect(page).to have_content 'runner-active'
           expect(page).not_to have_content 'runner-paused'
         end
@@ -68,7 +68,7 @@ describe "Admin Runners" do
           visit admin_runners_path
-          input_filtered_search_keys('status=offline')
+          input_filtered_search_keys('status:=offline')
           expect(page).not_to have_content 'runner-active'
           expect(page).not_to have_content 'runner-paused'
@@ -83,12 +83,12 @@ describe "Admin Runners" do
           visit admin_runners_path
-          input_filtered_search_keys('status=active')
+          input_filtered_search_keys('status:=active')
           expect(page).to have_content 'runner-a-1'
           expect(page).to have_content 'runner-b-1'
           expect(page).not_to have_content 'runner-a-2'
-          input_filtered_search_keys('status=active runner-a')
+          input_filtered_search_keys('status:=active runner-a')
           expect(page).to have_content 'runner-a-1'
           expect(page).not_to have_content 'runner-b-1'
           expect(page).not_to have_content 'runner-a-2'
@@ -105,7 +105,7 @@ describe "Admin Runners" do
           expect(page).to have_content 'runner-project'
           expect(page).to have_content 'runner-group'
-          input_filtered_search_keys('type=project_type')
+          input_filtered_search_keys('type:=project_type')
           expect(page).to have_content 'runner-project'
           expect(page).not_to have_content 'runner-group'
         end
@@ -116,7 +116,7 @@ describe "Admin Runners" do
           visit admin_runners_path
-          input_filtered_search_keys('type=instance_type')
+          input_filtered_search_keys('type:=instance_type')
           expect(page).not_to have_content 'runner-project'
           expect(page).not_to have_content 'runner-group'
@@ -131,12 +131,12 @@ describe "Admin Runners" do
           visit admin_runners_path
-          input_filtered_search_keys('type=project_type')
+          input_filtered_search_keys('type:=project_type')
           expect(page).to have_content 'runner-a-1'
           expect(page).to have_content 'runner-b-1'
           expect(page).not_to have_content 'runner-a-2'
-          input_filtered_search_keys('type=project_type runner-a')
+          input_filtered_search_keys('type:=project_type runner-a')
           expect(page).to have_content 'runner-a-1'
           expect(page).not_to have_content 'runner-b-1'
           expect(page).not_to have_content 'runner-a-2'
@@ -153,7 +153,7 @@ describe "Admin Runners" do
           expect(page).to have_content 'runner-blue'
           expect(page).to have_content 'runner-red'
-          input_filtered_search_keys('tag=blue')
+          input_filtered_search_keys('tag:=blue')
           expect(page).to have_content 'runner-blue'
           expect(page).not_to have_content 'runner-red'
@@ -165,7 +165,7 @@ describe "Admin Runners" do
           visit admin_runners_path
-          input_filtered_search_keys('tag=red')
+          input_filtered_search_keys('tag:=red')
           expect(page).not_to have_content 'runner-blue'
           expect(page).not_to have_content 'runner-blue'
@@ -179,13 +179,13 @@ describe "Admin Runners" do
           visit admin_runners_path
-          input_filtered_search_keys('tag=blue')
+          input_filtered_search_keys('tag:=blue')
           expect(page).to have_content 'runner-a-1'
           expect(page).to have_content 'runner-b-1'
           expect(page).not_to have_content 'runner-a-2'
-          input_filtered_search_keys('tag=blue runner-a')
+          input_filtered_search_keys('tag:=blue runner-a')
           expect(page).to have_content 'runner-a-1'
           expect(page).not_to have_content 'runner-b-1'

spec/features/boards/boards_spec.rb

@@ -624,7 +624,7 @@ describe 'Issue Boards', :js do
   end
   def set_filter(type, text)
-    find('.filtered-search').native.send_keys("#{type}=#{text}")
+    find('.filtered-search').native.send_keys("#{type}:=#{text}")
   end
   def submit_filter

spec/features/boards/modal_filter_spec.rb

@@ -211,7 +211,7 @@ describe 'Issue Boards add issue modal filtering', :js do
   end
   def set_filter(type, text = '')
-    find('.add-issues-modal .filtered-search').native.send_keys("#{type}=#{text}")
+    find('.add-issues-modal .filtered-search').native.send_keys("#{type}:=#{text}")
   end
   def submit_filter

spec/features/dashboard/issues_filter_spec.rb

@@ -28,14 +28,14 @@ describe 'Dashboard Issues filtering', :js do
   context 'filtering by milestone' do
     it 'shows all issues with no milestone' do
-      input_filtered_search("milestone=none")
+      input_filtered_search("milestone:=none")
       expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1)
       expect(page).to have_selector('.issue', count: 1)
     end
     it 'shows all issues with the selected milestone' do
-      input_filtered_search("milestone=%\"#{milestone.title}\"")
+      input_filtered_search("milestone:=%\"#{milestone.title}\"")
       expect(page).to have_issuable_counts(open: 1, closed: 0, all: 1)
       expect(page).to have_selector('.issue', count: 1)
@@ -63,7 +63,7 @@ describe 'Dashboard Issues filtering', :js do
     let!(:label_link) { create(:label_link, label: label, target: issue) }
     it 'shows all issues with the selected label' do
-      input_filtered_search("label=~#{label.title}")
+      input_filtered_search("label:=~#{label.title}")
       page.within 'ul.content-list' do
         expect(page).to have_content issue.title

spec/features/dashboard/issues_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe 'Dashboard Issues' do
     it 'shows issues when current user is author', :js do
       reset_filters
-      input_filtered_search("author=#{current_user.to_reference}")
+      input_filtered_search("author:=#{current_user.to_reference}")
       expect(page).to have_content(authored_issue.title)
       expect(page).to have_content(authored_issue_on_public_project.title)

spec/features/dashboard/merge_requests_spec.rb

@@ -107,7 +107,7 @@ describe 'Dashboard Merge Requests' do
     it 'shows authored merge requests', :js do
       reset_filters
-      input_filtered_search("author=#{current_user.to_reference}")
+      input_filtered_search("author:=#{current_user.to_reference}")
       expect(page).to have_content(authored_merge_request.title)
       expect(page).to have_content(authored_merge_request_from_fork.title)
@@ -120,7 +120,7 @@ describe 'Dashboard Merge Requests' do
     it 'shows labeled merge requests', :js do
       reset_filters
-      input_filtered_search("label=#{label.name}")
+      input_filtered_search("label:=#{label.name}")
       expect(page).to have_content(labeled_merge_request.title)