Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/user_popovers.js

@@ -73,9 +73,14 @@ const handleUserPopoverMouseOver = event => {
             location: userData.location,
             bio: userData.bio,
             organization: userData.organization,
+            status: userData.status,
             loaded: true,
           });
+          if (userData.status) {
+            return Promise.resolve();
+          }
+
           return UsersCache.retrieveStatusById(userId);
         })
         .then(status => {

app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue

@@ -51,7 +51,7 @@ export default {
 </script>
 <template>
-  <gl-popover :target="target" boundary="viewport" placement="top" show>
+  <gl-popover :target="target" boundary="viewport" placement="top" offset="0, 1" show>
     <div class="user-popover d-flex">
       <div class="p-1 flex-shrink-1">
         <user-avatar-image :img-src="user.avatarUrl" :size="60" css-classes="mr-2" />
@@ -90,7 +90,7 @@ export default {
             name="location"
             class="category-icon flex-shrink-0"
           />
-          <span class="ml-1">{{ user.location }}</span>
+          <span v-if="user.location" class="ml-1">{{ user.location }}</span>
           <gl-skeleton-loading
             v-if="locationIsLoading"
             :lines="1"

app/controllers/concerns/milestone_actions.rb

@@ -53,12 +53,10 @@ module MilestoneActions
   # rubocop:disable Gitlab/ModuleWithInstanceVariables
   def milestone_redirect_path
-    if @project
-      project_milestone_path(@project, @milestone)
-    elsif @group
-      group_milestone_path(@group, @milestone.safe_title, title: @milestone.title)
+    if @milestone.global_milestone?
+      url_for(action: :show, title: @milestone.title)
     else
-      dashboard_milestone_path(@milestone.safe_title, title: @milestone.title)
+      url_for(action: :show)
     end
   end
   # rubocop:enable Gitlab/ModuleWithInstanceVariables

app/helpers/milestones_helper.rb

@@ -4,6 +4,18 @@ module MilestonesHelper
   include EntityDateHelper
   include Gitlab::Utils::StrongMemoize
+  def milestone_status_string(milestone)
+    if milestone.closed?
+      _('Closed')
+    elsif milestone.expired?
+      _('Past due')
+    elsif milestone.upcoming?
+      _('Upcoming')
+    else
+      _('Open')
+    end
+  end
+
   def milestones_filter_path(opts = {})
     if @project
       project_milestones_path(@project, opts)
@@ -213,33 +225,19 @@ module MilestonesHelper
     end
   end
-  def milestone_merge_request_tab_path(milestone)
-    if @project
-      merge_requests_project_milestone_path(@project, milestone, format: :json)
-    elsif @group
-      merge_requests_group_milestone_path(@group, milestone.safe_title, title: milestone.title, format: :json)
+  def milestone_tab_path(milestone, tab)
+    if milestone.global_milestone?
+      url_for(action: tab, title: milestone.title, format: :json)
     else
-      merge_requests_dashboard_milestone_path(milestone, title: milestone.title, format: :json)
+      url_for(action: tab, format: :json)
     end
   end
-  def milestone_participants_tab_path(milestone)
-    if @project
-      participants_project_milestone_path(@project, milestone, format: :json)
-    elsif @group
-      participants_group_milestone_path(@group, milestone.safe_title, title: milestone.title, format: :json)
+  def update_milestone_path(milestone, params = {})
+    if milestone.project_milestone?
+      project_milestone_path(milestone.project, milestone, milestone: params)
     else
-      participants_dashboard_milestone_path(milestone, title: milestone.title, format: :json)
-    end
-  end
-
-  def milestone_labels_tab_path(milestone)
-    if @project
-      labels_project_milestone_path(@project, milestone, format: :json)
-    elsif @group
-      labels_group_milestone_path(@group, milestone.safe_title, title: milestone.title, format: :json)
-    else
-      labels_dashboard_milestone_path(milestone, title: milestone.title, format: :json)
+      group_milestone_route(milestone, params)
     end
   end
@@ -264,6 +262,14 @@ module MilestonesHelper
     milestone_path(milestone.milestone, params)
   end
+  def edit_milestone_path(milestone)
+    if milestone.group_milestone?
+      edit_group_milestone_path(milestone.group, milestone)
+    elsif milestone.project_milestone?
+      edit_project_milestone_path(milestone.project, milestone)
+    end
+  end
+
   def can_admin_project_milestones?
     strong_memoize(:can_admin_project_milestones) do
       can?(current_user, :admin_milestone, @project)

app/models/concerns/milestoneish.rb

@@ -101,6 +101,10 @@ module Milestoneish
     false
   end
+  def global_milestone?
+    false
+  end
+
   def total_issue_time_spent
     @total_issue_time_spent ||= issues.joins(:timelogs).sum(:time_spent)
   end

app/models/dashboard_group_milestone.rb

@@ -18,4 +18,8 @@ class DashboardGroupMilestone < GlobalMilestone
     milestones = milestones.search_title(params[:search_title]) if params[:search_title].present?
     Milestone.filter_by_state(milestones, params[:state]).map { |m| new(m) }
   end
+
+  def dashboard_milestone?
+    true
+  end
 end

app/models/global_milestone.rb

@@ -100,4 +100,8 @@ class GlobalMilestone
   def labels
     @labels ||= GlobalLabel.build_collection(milestone.labels).sort_by!(&:title)
   end
+
+  def global_milestone?
+    true
+  end
 end

app/models/milestone.rb

@@ -330,6 +330,6 @@ class Milestone < ApplicationRecord
   end
   def issues_finder_params
-    { project_id: project_id }
+    { project_id: project_id, group_id: group_id }.compact
   end
 end

app/views/groups/milestones/show.html.haml

 = render "header_title"
 = render 'shared/milestones/top', milestone: @milestone, group: @group
-= render 'shared/milestones/tabs', milestone: @milestone, show_project_name: true if @milestone.legacy_group_milestone?
+= render 'shared/milestones/tabs', milestone: @milestone, show_project_name: true
 = render 'shared/milestones/sidebar', milestone: @milestone, affix_offset: 102

app/views/projects/milestones/show.html.haml

@@ -3,57 +3,8 @@
 - page_title       @milestone.title, _('Milestones')
 - page_description @milestone.description
-.detail-page-header.milestone-page-header
-  .status-box{ class: status_box_class(@milestone) }
-    - if @milestone.closed?
-      = _('Closed')
-    - elsif @milestone.expired?
-      = _('Past due')
-    - elsif @milestone.upcoming?
-      = _('Upcoming')
-    - else
-      = _('Open')
-  .header-text-content
-    %span.identifier
-      %strong
-        = _('Milestone')
-    - if @milestone.due_date || @milestone.start_date
-      = milestone_date_range(@milestone)
-  .milestone-buttons
-    - if can?(current_user, :admin_milestone, @project)
-      = link_to edit_project_milestone_path(@project, @milestone), class: 'btn btn-grouped btn-nr' do
-        = _('Edit')
-
-      - if @project.group
-        %button.js-promote-project-milestone-button.btn.btn-grouped{ data: { toggle: 'modal',
-          target: '#promote-milestone-modal',
-          milestone_title: @milestone.title,
-          group_name: @project.group.name,
-          url: promote_project_milestone_path(@milestone.project, @milestone),
-          container: 'body' },
-          disabled: true,
-          type: 'button' }
-          = _('Promote')
-        #promote-milestone-modal
-
-      - if @milestone.active?
-        = link_to _('Close milestone'), project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: 'btn btn-close btn-nr btn-grouped'
-      - else
-        = link_to _('Reopen milestone'), project_milestone_path(@project, @milestone, milestone: {state_event: :activate }), method: :put, class: 'btn btn-reopen btn-nr btn-grouped'
-
-      = render 'shared/milestones/delete_button'
-
-    %a.btn.btn-default.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle{ href: '#' }
-      = icon('angle-double-left')
-
-.detail-page-description.milestone-detail
-  %h2.title.qa-milestone-title
-    = markdown_field(@milestone, :title)
-
-  %div
-    - if @milestone.description.present?
-      .description.md
-        = markdown_field(@milestone, :description)
+= render 'shared/milestones/header', milestone: @milestone
+= render 'shared/milestones/description', milestone: @milestone
 = render_if_exists 'shared/milestones/burndown', milestone: @milestone, project: @project

app/views/shared/milestones/_description.html.haml

+.detail-page-description.milestone-detail
+  %h2.title
+    = markdown_field(milestone, :title)
+
+  - if milestone.try(:description).present?
+    %div
+      .description.md
+        = markdown_field(milestone, :description)

app/views/shared/milestones/_header.html.haml

+.detail-page-header.milestone-page-header
+  .status-box{ class: status_box_class(milestone) }
+    = milestone_status_string(milestone)
+
+  .header-text-content
+    %span.identifier
+      %strong
+        = _('Milestone')
+    - if milestone.due_date || milestone.start_date
+      = milestone_date_range(milestone)
+
+  .milestone-buttons
+    - if can?(current_user, :admin_milestone, @group || @project)
+      - unless milestone.legacy_group_milestone?
+        = link_to _('Edit'), edit_milestone_path(milestone), class: 'btn btn-grouped'
+
+      - if milestone.project_milestone? && milestone.project.group
+        %button.js-promote-project-milestone-button.btn.btn-grouped{ data: { toggle: 'modal',
+          target: '#promote-milestone-modal',
+          milestone_title: milestone.title,
+          group_name: milestone.project.group.name,
+          url: promote_project_milestone_path(milestone.project, milestone),
+          container: 'body' },
+          disabled: true,
+          type: 'button' }
+          = _('Promote')
+        #promote-milestone-modal
+
+      - if milestone.active?
+        = link_to _('Close milestone'), update_milestone_path(milestone, { state_event: :close }), method: :put, class: 'btn btn-grouped btn-close'
+      - else
+        = link_to _('Reopen milestone'), update_milestone_path(milestone, { state_event: :activate }), method: :put, class: 'btn btn-grouped btn-reopen'
+
+      - unless milestone.legacy_group_milestone?
+        = render 'shared/milestones/delete_button'
+
+    %button.btn.btn-default.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle{ type: 'button' }
+      = icon('angle-double-left')

app/views/shared/milestones/_tabs.html.haml

-- issues_accessible = milestone.is_a?(GlobalMilestone) || can?(current_user, :read_issue, @project)
-
 .scrolling-tabs-container.inner-page-scroll-tabs.is-smaller
   .fade-left= icon('angle-left')
   .fade-right= icon('angle-right')
   %ul.nav-links.scrolling-tabs.js-milestone-tabs.nav.nav-tabs
-    - if issues_accessible
-      %li.nav-item
-        = link_to '#tab-issues', class: 'nav-link active', 'data-toggle' => 'tab', 'data-show' => '.tab-issues-buttons' do
-          Issues
-          %span.badge.badge-pill= milestone.issues_visible_to_user(current_user).size
-      %li.nav-item
-        = link_to '#tab-merge-requests', class: 'nav-link', 'data-toggle' => 'tab', 'data-endpoint': milestone_merge_request_tab_path(milestone) do
-          Merge Requests
-          %span.badge.badge-pill= milestone.merge_requests_visible_to_user(current_user).size
-    - else
-      %li.nav-item
-        = link_to '#tab-merge-requests', class: 'nav-link active', 'data-toggle' => 'tab', 'data-endpoint': milestone_merge_request_tab_path(milestone) do
-          Merge Requests
-          %span.badge.badge-pill= milestone.merge_requests.size
     %li.nav-item
-      = link_to '#tab-participants', class: 'nav-link', 'data-toggle' => 'tab', 'data-endpoint': milestone_participants_tab_path(milestone) do
-        Participants
+      = link_to '#tab-issues', class: 'nav-link active', data: { toggle: 'tab', show: '.tab-issues-buttons' } do
+        = _('Issues')
+        %span.badge.badge-pill= milestone.issues_visible_to_user(current_user).size
+    %li.nav-item
+      = link_to '#tab-merge-requests', class: 'nav-link', data: { toggle: 'tab', endpoint: milestone_tab_path(milestone, 'merge_requests') } do
+        = _('Merge Requests')
+        %span.badge.badge-pill= milestone.merge_requests_visible_to_user(current_user).size
+    %li.nav-item
+      = link_to '#tab-participants', class: 'nav-link', data: { toggle: 'tab', endpoint: milestone_tab_path(milestone, 'participants') } do
+        = _('Participants')
         %span.badge.badge-pill= milestone.issue_participants_visible_by_user(current_user).count
     %li.nav-item
-      = link_to '#tab-labels', class: 'nav-link', 'data-toggle' => 'tab', 'data-endpoint': milestone_labels_tab_path(milestone) do
-        Labels
+      = link_to '#tab-labels', class: 'nav-link', data: { toggle: 'tab', endpoint: milestone_tab_path(milestone, 'labels') } do
+        = _('Labels')
         %span.badge.badge-pill= milestone.issue_labels_visible_by_user(current_user).count
 - issues = milestone.sorted_issues(current_user)
@@ -32,16 +24,11 @@
 - show_full_project_name = local_assigns.fetch(:show_full_project_name, false)
 .tab-content.milestone-content
-  - if issues_accessible
-    .tab-pane.active#tab-issues{ data: { sort_endpoint: (sort_issues_project_milestone_path(@project, @milestone) if @project && current_user) } }
-      = render 'shared/milestones/issues_tab', issues: issues, show_project_name: show_project_name, show_full_project_name: show_full_project_name
-    .tab-pane#tab-merge-requests
-      -# loaded async
-      = render "shared/milestones/tab_loading"
-  - else
-    .tab-pane.active#tab-merge-requests
-      -# loaded async
-      = render "shared/milestones/tab_loading"
+  .tab-pane.active#tab-issues{ data: { sort_endpoint: (sort_issues_project_milestone_path(@project, @milestone) if @project && current_user) } }
+    = render 'shared/milestones/issues_tab', issues: issues, show_project_name: show_project_name, show_full_project_name: show_full_project_name
+  .tab-pane#tab-merge-requests
+    -# loaded async
+    = render "shared/milestones/tab_loading"
   .tab-pane#tab-participants
     -# loaded async
     = render "shared/milestones/tab_loading"

app/views/shared/milestones/_top.html.haml

@@ -4,54 +4,15 @@
 - group = local_assigns[:group]
 - is_dynamic_milestone = milestone.legacy_group_milestone? || milestone.dashboard_milestone?
-.detail-page-header.milestone-page-header
-  .status-box{ class: "status-box-#{milestone.closed? ? 'closed' : 'open'}" }
-    - if milestone.closed?
-      Closed
-    - elsif milestone.expired?
-      Expired
-    - else
-      Open
-
-  .header-text-content
-    %span.identifier
-      Milestone #{milestone.title}
-    - if milestone.due_date || milestone.start_date
-      %span.creator
-         ·
-        = milestone_date_range(milestone)
-
-  .milestone-buttons
-    - if group
-      - if can?(current_user, :admin_milestone, group)
-        - if milestone.group_milestone?
-          = link_to edit_group_milestone_path(group, milestone), class: "btn btn btn-grouped" do
-            Edit
-        - if milestone.active?
-          = link_to 'Close Milestone', group_milestone_route(milestone, {state_event: :close }), method: :put, class: "btn btn-grouped btn-close"
-        - else
-          = link_to 'Reopen Milestone', group_milestone_route(milestone, {state_event: :activate }), method: :put, class: "btn btn-grouped btn-reopen"
-
-        - unless is_dynamic_milestone
-          = render 'shared/milestones/delete_button'
-
-    %a.btn.btn-default.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle{ href: "#" }
-      = icon('angle-double-left')
-
+= render 'shared/milestones/header', milestone: milestone
 = render 'shared/milestones/deprecation_message' if is_dynamic_milestone
-
-.detail-page-description.milestone-detail
-  %h2.title
-    = markdown_field(milestone, :title)
-  - if milestone.group_milestone? && milestone.description.present?
-    %div
-      .description.md
-        = markdown_field(milestone, :description)
+= render 'shared/milestones/description', milestone: milestone
 - if milestone.complete?(current_user) && milestone.active?
   .alert.alert-success.prepend-top-default
-    - close_msg = group ? 'You may close the milestone now.' : 'Navigate to the project to close the milestone.'
-    %span All issues for this milestone are closed. #{close_msg}
+    %span
+      = _('All issues for this milestone are closed.')
+      = group ? _('You may close the milestone now.') : _('Navigate to the project to close the milestone.')
 = render_if_exists 'shared/milestones/burndown', milestone: milestone, project: @project
@@ -77,10 +38,3 @@
               Open
           %td
             = milestone.expires_at
-- elsif milestone.group_milestone?
-  %br
-  View
-  = link_to 'Issues', issues_group_path(@group, milestone_title: milestone.title)
-  or
-  = link_to 'Merge Requests', merge_requests_group_path(@group, milestone_title: milestone.title)
-  in this milestone

changelogs/unreleased/19445-native-group-milestone-page-needs-same-info-as-project-milestones.yml

+---
+title: Add issues, MRs, participants, and labels tabs in group milestone page
+merge_request: 18818
+author:
+type: added

changelogs/unreleased/34423-user-popover-immediately-closed-when-hovering-over-certain-areas.yml

+---
+title: Fix user popover not being displayed when the user has a status message
+merge_request: 19519
+author:
+type: fixed

changelogs/unreleased/34577-add-dep-scanner-var-maven.yml

+---
+title: Add maven cli opts flag to maven security analyzer (part of dependency scanning)
+merge_request: 19174
+author:
+type: changed

doc/topics/git/partial_clone.md

@@ -39,16 +39,20 @@ Follow [Git for enormous repositories](https://gitlab.com/groups/gitlab-org/-/ep
 ## Enabling partial clone
-GitLab 12.1 uses Git 2.21.0 which has an arbitrary file access security
-vulnerability when `uploadpack.allowFilter` is enabled, and should not be
-enabled in production environments.
-A feature flag is planned to enable `uploadpack.allowFilter` and
-`uploadpack.allowAnySHA1InWant` once the version of Git used by GitLab has been
-updated to Git 2.22.0.
-Follow [this issue](https://gitlab.com/gitlab-org/gitaly/issues/1553) for
-updated.
+> [Introduced](https://gitlab.com/gitlab-org/gitaly/issues/1553) in GitLab 12.4.
+To enable partial clone, use the [feature flags API](../../api/features.md).
+For example:
+```sh
+curl --data "value=true" --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/features/gitaly_upload_pack_filter
+```
+
+Alternatively, flip the switch and enable the feature flag:
+
+```ruby
+Feature.enable(:gitaly_upload_pack_filter)
+```
 ## Excluding objects by size

doc/user/application_security/dependency_scanning/index.md

@@ -140,6 +140,33 @@ using environment variables.
 | `DS_RUN_ANALYZER_TIMEOUT`               | Time limit when running an analyzer. Timeouts are parsed using Go's [`ParseDuration`](https://golang.org/pkg/time/#ParseDuration). Valid time units are `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`. For example, `300ms`, `1.5h`, or `2h45m`. | |
 | `PIP_INDEX_URL`                         | Base URL of Python Package Index (default `https://pypi.org/simple`). | |
 | `PIP_EXTRA_INDEX_URL`                   | Array of [extra URLs](https://pip.pypa.io/en/stable/reference/pip_install/#cmdoption-extra-index-url) of package indexes to use in addition to `PIP_INDEX_URL`. Comma separated. | |
+| `MAVEN_CLI_OPTS`                        | List of command line arguments that will be passed to the maven analyzer during the project's build phase (see example for [using private repos](#using-private-maven-repos)). | |
+
+### Using private Maven repos
+
+If you have a private Maven repository which requires login credentials,
+you can use the `MAVEN_CLI_OPTS` environment variable to pass variables
+specified in your settings (e.g., username, password, etc.).
+
+For example, if you have a settings file in your project source (e.g., `mysettings.xml`)
+that looks like the following, you can specify the variables
+[by adding an entry under your project's settings](../../../ci/variables/README.md#via-the-ui),
+so that you don't have to expose your private data in `.gitlab-ci.yml` (e.g., adding
+`MAVEN_CLI_OPTS` with value `--settings mysettings.xml -Dprivate.username=foo -Dprivate.password=bar`).
+
+```xml
+<!-- mysettings.xml -->
+<settings>
+    ...
+    <servers>
+        <server>
+            <id>private_server</id>
+            <username>${private.username}</username>
+            <password>${private.password}</password>
+        </server>
+    </servers>
+</settings>
+```
 ## Interacting with the vulnerabilities