Merge remote-tracking branch 'origin/master' into...

Merge remote-tracking branch 'origin/master' into camilstaps/gitlab-ce-new-66023-public-private-fork-counts

app/models/repository.rb

@@ -1134,6 +1134,10 @@ class Repository
     @cache ||= Gitlab::RepositoryCache.new(self)
   end
+  def redis_set_cache
+    @redis_set_cache ||= Gitlab::RepositorySetCache.new(self)
+  end
+
   def request_store_cache
     @request_store_cache ||= Gitlab::RepositoryCache.new(self, backend: Gitlab::SafeRequestStore)
   end

app/models/user.rb

@@ -23,12 +23,6 @@ class User < ApplicationRecord
   DEFAULT_NOTIFICATION_LEVEL = :participating
-  self.ignored_columns += %i[
-    authentication_token
-    email_provider
-    external_email
-  ]
-
   add_authentication_token_field :incoming_email_token, token_generator: -> { SecureRandom.hex.to_i(16).to_s(36) }
   add_authentication_token_field :feed_token

app/presenters/event_presenter.rb

+# frozen_string_literal: true
+
+class EventPresenter < Gitlab::View::Presenter::Delegated
+  presents :event
+
+  def resource_parent_name
+    resource_parent&.full_name || ''
+  end
+
+  def target_link_options
+    case resource_parent
+    when Group
+      [event.group, event.target]
+    when Project
+      [event.project.namespace.becomes(Namespace), event.project, event.target]
+    else
+      ''
+    end
+  end
+end

app/services/merge_requests/build_service.rb

@@ -33,7 +33,8 @@ module MergeRequests
       merge_request.assign_attributes(params.to_h.compact)
       merge_request.compare_commits = []
-      merge_request.target_branch = find_target_branch
+      set_merge_request_target_branch
+
       merge_request.can_be_created = projects_and_branches_valid?
       # compare branches only if branches are valid, otherwise
@@ -93,8 +94,12 @@ module MergeRequests
       project_from_params
     end
-    def find_target_branch
-      target_branch || target_project.default_branch
+    def set_merge_request_target_branch
+      if source_branch_default? && !target_branch_specified?
+        merge_request.target_branch = nil
+      else
+        merge_request.target_branch ||= target_project.default_branch
+      end
     end
     def source_branch_specified?
@@ -149,7 +154,15 @@ module MergeRequests
     end
     def same_source_and_target?
-      source_project == target_project && target_branch == source_branch
+      same_source_and_target_project? && target_branch == source_branch
+    end
+
+    def source_branch_default?
+      same_source_and_target_project? && source_branch == target_project.default_branch
+    end
+
+    def same_source_and_target_project?
+      source_project == target_project
     end
     def source_branch_exists?

app/views/events/_event.atom.builder

 return unless event.visible_to_user?(current_user)
+event = event.present
+
 xml.entry do
   xml.id      "tag:#{request.host},#{event.created_at.strftime("%Y-%m-%d")}:#{event.id}"
   xml.link    href: event_feed_url(event)

app/views/events/_event.html.haml

+- event = event.present
+
 - if event.visible_to_user?(current_user)
   .event-item
     .event-item-timestamp

app/views/events/_event_scope.html.haml

@@ -2,6 +2,5 @@
   = event_preposition(event)
   - if event.project
     = link_to_project(event.project)
-  - else
-    = event.project_name
-
+  - elsif event.group
+    = link_to event.resource_parent_name, group_path(event.group)

app/views/events/event/_common.html.haml

@@ -8,7 +8,7 @@
     %span.event-type.d-inline-block.append-right-4{ class: event.action_name }
       = event.action_name
     %span.event-target-type.append-right-4= event.target_type.titleize.downcase
-    = link_to [event.project.namespace.becomes(Namespace), event.project, event.target], class: 'has-tooltip event-target-link append-right-4', title: event.target_title do
+    = link_to event.target_link_options, class: 'has-tooltip event-target-link append-right-4', title: event.target_title do
       = event.target.reference_link_text
     - unless event.milestone?
       %span.event-target-title.append-right-4{ dir: "auto" }
@@ -17,4 +17,4 @@
     %span.event-type.d-inline-block.append-right-4{ class: event.action_name }
       = event_action_name(event)
-  = render "events/event_scope", event: event
+  = render "events/event_scope", event: event if event.resource_parent.present?

app/views/events/event/_created_project.html.haml

@@ -10,4 +10,4 @@
   - if event.project
     = link_to_project(event.project)
   - else
-    = event.project_name
+    = event.resource_parent_name

app/views/projects/merge_requests/creations/_new_compare.html.haml

@@ -51,7 +51,7 @@
                   selected: f.object.target_project_id
           .merge-request-select.dropdown
             = f.hidden_field :target_branch
-            = dropdown_toggle f.object.target_branch, { toggle: "dropdown", 'field-name': "#{f.object_name}[target_branch]", 'refs-url': refs_project_path(f.object.target_project), selected: f.object.target_branch }, { toggle_class: "js-compare-dropdown js-target-branch monospace" }
+            = dropdown_toggle f.object.target_branch || _("Select target branch"), { toggle: "dropdown", 'field-name': "#{f.object_name}[target_branch]", 'refs-url': refs_project_path(f.object.target_project), selected: f.object.target_branch }, { toggle_class: "js-compare-dropdown js-target-branch monospace" }
             .dropdown-menu.dropdown-menu-selectable.js-target-branch-dropdown.git-revision-dropdown
               = dropdown_title(_("Select target branch"))
               = dropdown_filter(_("Search branches"))

app/views/projects/releases/index.html.haml

 - page_title _('Releases')
-#js-releases-page{ data: { project_id: @project.id, illustration_path: image_path('illustrations/releases.svg'), documentation_path: help_page_path('user/project/releases/index') } }
+#js-releases-page{ data: data_for_releases_page }

app/views/shared/issuable/_sidebar.html.haml

@@ -41,7 +41,7 @@
             = link_to _('Edit'), '#', class: 'js-sidebar-dropdown-toggle edit-link float-right', data: { track_label: "right_sidebar", track_property: "milestone", track_event: "click_edit_button", track_value: "" }
         .value.hide-collapsed
           - if milestone.present?
-            = link_to milestone[:title], milestone[:web_url], class: "bold has-tooltip", title: sidebar_milestone_remaining_days(milestone), data: { container: "body", html: 'true', boundary: 'viewport' }
+            = link_to milestone[:title], milestone[:web_url], class: "bold has-tooltip", title: sidebar_milestone_remaining_days(milestone), data: { container: "body", html: 'true', boundary: 'viewport', qa_selector: 'milestone_link' }
           - else
             %span.no-value
               = _('None')

app/views/shared/issuable/_sidebar_assignees.html.haml

 - issuable_type = issuable_sidebar[:type]
 - signed_in = !!issuable_sidebar.dig(:current_user, :id)
-#js-vue-sidebar-assignees{ data: { field: "#{issuable_type}[assignee_ids]", signed_in: signed_in } }
+#js-vue-sidebar-assignees{ data: { field: "#{issuable_type}", signed_in: signed_in } }
   .title.hide-collapsed
     = _('Assignee')
     = icon('spinner spin')

app/views/users/calendar_activities.html.haml

@@ -27,7 +27,7 @@
             - if event.project
               = link_to_project(event.project)
             - else
-              = event.project_name
+              = event.resource_parent_name
         - else
           made a private contribution
 - else

changelogs/unreleased/34338-details-element.yml

+---
+title: Add some padding to details markdown element
+merge_request: 32716
+author:
+type: fixed

changelogs/unreleased/64122-documentation-lacks-how-to-enable-project-snippets.yml

+---
+title: Mention in docs how to disable project snippets
+merge_request: 32391
+author: Jacopo Beschi @jacopo-beschi
+type: other

changelogs/unreleased/fj-62807-not-prefill-target-branch.yml

+---
+title: Avoid prefilling target branch when source branch is the default one
+merge_request: 32701
+author:
+type: other

changelogs/unreleased/issue-67127.yml

+---
+title: Expose 'protected' field for Tag API endpoint.
+merge_request: 32790
+author: Andrea Leone
+type: added

changelogs/unreleased/jivanvl-add-caret-icon-dashboard.yml

+---
+title: Add caret icons to the monitoring dashboard
+merge_request: 32239
+author:
+type: changed

changelogs/unreleased/remove-vue-resource-from-sidebar-service.yml

+---
+title: Remove vue resource from sidebar service
+merge_request: 32400
+author: Lee Tickett
+type: other