Add latest changes from gitlab-org/gitlab@master

6 files changed, 47 insertions, 31 deletions

diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index 2ae82b49609..06ba16f9724 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -60,9 +60,32 @@ module Emails
       @project = project
       @alert = alert.present
 
+      add_project_headers
+      add_alert_headers
+
       subject_text = "Alert: #{@alert.email_title}"
       mail(to: user.notification_email_for(@project.group), subject: subject(subject_text))
     end
+
+    private
+
+    def add_alert_headers
+      return unless @alert
+
+      headers['X-GitLab-Alert-ID'] = @alert.id
+      headers['X-GitLab-Alert-IID'] = @alert.iid
+      headers['X-GitLab-NotificationReason'] = "alert_#{@alert.state}"
+
+      add_incident_headers
+    end
+
+    def add_incident_headers
+      incident = @alert.issue
+      return unless incident
+
+      headers['X-GitLab-Incident-ID'] = incident.id
+      headers['X-GitLab-Incident-IID'] = incident.iid
+    end
   end
 end
 
diff --git a/app/models/integrations/irker.rb b/app/models/integrations/irker.rb
index 7048dd641ea..cea4aa2038d 100644
--- a/app/models/integrations/irker.rb
+++ b/app/models/integrations/irker.rb
@@ -4,6 +4,8 @@ require 'uri'
 
 module Integrations
   class Irker < Integration
+    include ActionView::Helpers::UrlHelper
+
     prop_accessor :server_host, :server_port, :default_irc_uri
     prop_accessor :recipients, :channels
     boolean_accessor :colorize_messages
@@ -12,11 +14,11 @@ module Integrations
     before_validation :get_channels
 
     def title
-      'Irker (IRC gateway)'
+      s_('IrkerService|irker (IRC gateway)')
     end
 
     def description
-      'Send IRC messages.'
+      s_('IrkerService|Send update messages to an irker server.')
     end
 
     def self.to_param
@@ -42,33 +44,25 @@ module Integrations
     end
 
     def fields
+      recipients_docs_link = link_to s_('IrkerService|How to enter channels or users?'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/irker', anchor: 'enter-irker-recipients'), target: '_blank', rel: 'noopener noreferrer'
       [
-        { type: 'text', name: 'server_host', placeholder: 'localhost',
-          help: 'Irker daemon hostname (defaults to localhost)' },
-        { type: 'text', name: 'server_port', placeholder: 6659,
-          help: 'Irker daemon port (defaults to 6659)' },
-        { type: 'text', name: 'default_irc_uri', title: 'Default IRC URI',
-          help: 'A default IRC URI to prepend before each recipient (optional)',
+        { type: 'text', name: 'server_host', placeholder: 'localhost', title: s_('IrkerService|Server host (optional)'),
+          help: s_('IrkerService|irker daemon hostname (defaults to localhost).') },
+        { type: 'text', name: 'server_port', placeholder: 6659, title: s_('IrkerService|Server port (optional)'),
+          help: s_('IrkerService|irker daemon port (defaults to 6659).') },
+        { type: 'text', name: 'default_irc_uri', title: s_('IrkerService|Default IRC URI (optional)'),
+          help: s_('IrkerService|URI to add before each recipient.'),
           placeholder: 'irc://irc.network.net:6697/' },
-        { type: 'textarea', name: 'recipients',
-          placeholder: 'Recipients/channels separated by whitespaces', required: true,
-          help: 'Recipients have to be specified with a full URI: '\
-          'irc[s]://irc.network.net[:port]/#channel. Special cases: if '\
-          'you want the channel to be a nickname instead, append ",isnick" to ' \
-          'the channel name; if the channel is protected by a secret password, ' \
-          ' append "?key=secretpassword" to the URI (Note that due to a bug, if you ' \
-          ' want to use a password, you have to omit the "#" on the channel). If you ' \
-          ' specify a default IRC URI to prepend before each recipient, you can just ' \
-          ' give a channel name.' },
-        { type: 'checkbox', name: 'colorize_messages' }
+        { type: 'textarea', name: 'recipients', title: s_('IrkerService|Recipients'),
+          placeholder: 'irc[s]://irc.network.net[:port]/#channel', required: true,
+          help: s_('IrkerService|Channels and users separated by whitespaces. %{recipients_docs_link}').html_safe % { recipients_docs_link: recipients_docs_link.html_safe } },
+        { type: 'checkbox', name: 'colorize_messages', title: _('Colorize messages') }
       ]
     end
 
     def help
-      ' NOTE: Irker does NOT have built-in authentication, which makes it' \
-      ' vulnerable to spamming IRC channels if it is hosted outside of a ' \
-      ' firewall. Please make sure you run the daemon within a secured network ' \
-      ' to prevent abuse. For more details, read: http://www.catb.org/~esr/irker/security.html.'
+      docs_link = link_to _('Learn more.'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/irker', anchor: 'set-up-an-irker-daemon'), target: '_blank', rel: 'noopener noreferrer'
+      s_('IrkerService|Send update messages to an irker server. Before you can use this, you need to set up the irker daemon. %{docs_link}').html_safe % { docs_link: docs_link.html_safe }
     end
 
     private
diff --git a/app/models/members/group_member.rb b/app/models/members/group_member.rb
index cf5906a4cbf..ab044b80133 100644
--- a/app/models/members/group_member.rb
+++ b/app/models/members/group_member.rb
@@ -28,8 +28,6 @@ class GroupMember < Member
 
   attr_accessor :last_owner, :last_blocked_owner
 
-  self.enumerate_columns_in_select_statements = true
-
   def self.access_level_roles
     Gitlab::Access.options_with_owner
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 2824d192375..bfb0c29a023 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1576,10 +1576,11 @@ class User < ApplicationRecord
       .order('routes.path')
   end
 
-  def namespaces
-    namespace_ids = groups.pluck(:id)
-    namespace_ids.push(namespace.id)
-    Namespace.where(id: namespace_ids)
+  def namespaces(owned_only: false)
+    user_groups = owned_only ? owned_groups : groups
+    personal_namespace = Namespace.where(id: namespace.id)
+
+    Namespace.from_union([user_groups, personal_namespace])
   end
 
   def oauth_authorized_tokens
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index b6e063f5584..4dcd29382ce 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -533,7 +533,7 @@ class ProjectPolicy < BasePolicy
     enable :read_project_for_iids
   end
 
-  rule { ~project_allowed_for_job_token }.prevent_all
+  rule { ~public_project & ~internal_access & ~project_allowed_for_job_token }.prevent_all
 
   rule { can?(:public_access) }.policy do
     enable :read_package
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index 463984a13a2..22a5bada311 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -26,7 +26,7 @@
           = form_tag(project_commits_path(@project, @id), method: :get, class: 'commits-search-form js-signature-container', data: { 'signatures-path' => namespace_project_signatures_path }) do
             = search_field_tag :search, params[:search], { placeholder: _('Search by message'), id: 'commits-search', class: 'form-control gl-form-input input-short gl-mt-3 gl-sm-mt-0 gl-min-w-full', spellcheck: false }
         .control.d-none.d-md-block
-          = link_to project_commits_path(@project, @ref, rss_url_options), title: _("Commits feed"), class: 'btn gl-button btn-default btn-icon' do
+          = link_to project_commits_path(@project, @id, rss_url_options), title: _("Commits feed"), class: 'btn gl-button btn-default btn-icon' do
             = sprite_icon('rss', css_class: 'qa-rss-icon')
 
   = render_if_exists 'projects/commits/mirror_status'