Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-02

# Conflicts:
#	app/controllers/concerns/project_unauthorized.rb
#	app/controllers/projects/clusters_controller.rb
#	app/helpers/clusters_helper.rb
#	app/views/clusters/clusters/_integration_form.html.haml
#	config/routes.rb

[ci skip]

app/controllers/concerns/project_unauthorized.rb

 # frozen_string_literal: true
 
 module ProjectUnauthorized
+<<<<<<< HEAD
   prepend EE::ProjectUnauthorized
+=======
+>>>>>>> upstream/master
   extend ActiveSupport::Concern
 
   # EE would override this

app/controllers/projects/clusters_controller.rb

 # frozen_string_literal: true
 
 class Projects::ClustersController < Clusters::ClustersController
+<<<<<<< HEAD
   prepend EE::Projects::ClustersController
 
   include ProjectUnauthorized
@@ -8,6 +9,13 @@ class Projects::ClustersController < Clusters::ClustersController
   prepend_before_action :project
   before_action :repository
 
+=======
+  include ProjectUnauthorized
+
+  prepend_before_action :project
+  before_action :repository
+
+>>>>>>> upstream/master
   layout 'project'
 
   private

app/helpers/clusters_helper.rb

 # frozen_string_literal: true
 
 module ClustersHelper
+<<<<<<< HEAD
   prepend EE::ClustersHelper
 
+=======
+>>>>>>> upstream/master
   # EE overrides this
   def has_multiple_clusters?
     false

app/views/clusters/clusters/_integration_form.html.haml

+<<<<<<< HEAD:app/views/clusters/clusters/_integration_form.html.haml
 = form_for @cluster, url: clusterable.cluster_path(@cluster), as: :cluster, html: { class: 'cluster_integration_form' } do |field|
+=======
+= form_for @cluster, url: clusterable.cluster_path(@cluster), as: :cluster do |field|
+>>>>>>> upstream/master:app/views/clusters/clusters/_integration_form.html.haml
   = form_errors(@cluster)
   .form-group
     %h5= s_('ClusterIntegration|Integration status')

changelogs/unreleased/51620-cannot-add-label-to-issue-from-board.yml

+title: Make Issue Board sidebar show project-specific labels based on selected Issue
+merge_request: 22475
+author:
+type: fixed

config/routes.rb

@@ -99,9 +99,12 @@ Rails.application.routes.draw do
       end
 
       member do
+<<<<<<< HEAD
         # EE specific
         get :metrics, format: :json
 
+=======
+>>>>>>> upstream/master
         scope :applications do
           post '/:application', to: 'clusters/applications#create', as: :install_applications
         end

db/migrate/20180413022611_create_missing_namespace_for_internal_users.rb

@@ -45,7 +45,7 @@ class CreateMissingNamespaceForInternalUsers < ActiveRecord::Migration
       connection.exec_query(query).present?
     end
 
-    insert_query = "INSERT INTO namespaces(owner_id, path, name) VALUES(#{user_id}, '#{path}', '#{path}')"
+    insert_query = "INSERT INTO namespaces(owner_id, path, name, created_at, updated_at) VALUES(#{user_id}, '#{path}', '#{path}', NOW(), NOW())"
     namespace_id = connection.insert_sql(insert_query)
 
     create_route(namespace_id)
@@ -57,7 +57,7 @@ class CreateMissingNamespaceForInternalUsers < ActiveRecord::Migration
     row = connection.exec_query("SELECT id, path FROM namespaces WHERE id=#{namespace_id}").first
     id, path = row.values_at('id', 'path')
 
-    execute("INSERT INTO routes(source_id, source_type, path, name) VALUES(#{id}, 'Namespace', '#{path}', '#{path}')")
+    execute("INSERT INTO routes(source_id, source_type, path, name, created_at, updated_at) VALUES(#{id}, 'Namespace', '#{path}', '#{path}', NOW(), NOW())")
   end
 
   def set_notification_email(user_id)

spec/features/groups/board_sidebar_spec.rb

+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'Group Issue Boards', :js do
+  include BoardHelpers
+
+  let(:group)            { create(:group) }
+  let(:user)             { create(:group_member, user: create(:user), group: group ).user }
+  let!(:project_1)       { create(:project, :public, group: group) }
+  let!(:project_2)       { create(:project, :public, group: group) }
+  let!(:project_1_label) { create(:label, project: project_1, name: 'Development 1') }
+  let!(:project_2_label) { create(:label, project: project_2, name: 'Development 2') }
+  let!(:group_label)     { create(:group_label, title: 'Bug', description: 'Fusce consequat', group: group) }
+  let!(:issue_1)         { create(:labeled_issue, project: project_1, relative_position: 1) }
+  let!(:issue_2)         { create(:labeled_issue, project: project_2, relative_position: 2) }
+  let(:board)            { create(:board, group: group) }
+  let!(:list)            { create(:list, board: board, label: project_1_label, position: 0) }
+  let(:card)             { find('.board:nth-child(1)').first('.board-card') }
+
+  before do
+    sign_in(user)
+
+    visit group_board_path(group, board)
+    wait_for_requests
+  end
+
+  context 'labels' do
+    it 'only shows valid labels for the issue project and group' do
+      click_card(card)
+
+      page.within('.labels') do
+        click_link 'Edit'
+
+        wait_for_requests
+
+        page.within('.selectbox') do
+          expect(page).to have_content(project_1_label.title)
+          expect(page).to have_content(group_label.title)
+          expect(page).not_to have_content(project_2_label.title)
+        end
+      end
+    end
+  end
+end