Automatic merge of gitlab-org/gitlab-ce master

GITLAB_PAGES_VERSION

-1.6.0
+1.6.1

Gemfile

@@ -41,7 +41,7 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
 gem 'omniauth-twitter', '~> 1.4'
 gem 'omniauth_crowd', '~> 2.2.0'
 gem 'omniauth-authentiq', '~> 0.3.3'
-gem 'omniauth_openid_connect', '~> 0.3.0'
+gem 'omniauth_openid_connect', '~> 0.3.1'
 gem "omniauth-ultraauth", '~> 0.0.2'
 gem 'omniauth-salesforce', '~> 1.0.5'
 gem 'rack-oauth2', '~> 1.9.3'

Gemfile.lock

@@ -619,7 +619,7 @@ GEM
       activesupport
       nokogiri (>= 1.4.4)
       omniauth (~> 1.0)
-    omniauth_openid_connect (0.3.0)
+    omniauth_openid_connect (0.3.1)
       addressable (~> 2.5)
       omniauth (~> 1.3)
       openid_connect (~> 1.1)
@@ -1202,7 +1202,7 @@ DEPENDENCIES
   omniauth-twitter (~> 1.4)
   omniauth-ultraauth (~> 0.0.2)
   omniauth_crowd (~> 2.2.0)
-  omniauth_openid_connect (~> 0.3.0)
+  omniauth_openid_connect (~> 0.3.1)
   org-ruby (~> 0.9.12)
   peek (~> 1.0.1)
   peek-gc (~> 0.0.2)

changelogs/unreleased/jc-migration-for-source-project-id.yml

+---
+title: Fix null source_project_id in pool_repositories
+merge_request: 29157
+author:
+type: other

changelogs/unreleased/upgrade-pages-to-v1-6-1.yml

+---
+title: Update GitLab Pages to v1.6.1
+merge_request: 29559
+author:
+type: other

db/migrate/20190604184643_fix_pool_repository_source_project_id.rb

+# frozen_string_literal: true
+
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class FixPoolRepositorySourceProjectId < ActiveRecord::Migration[5.1]
+  include Gitlab::Database::MigrationHelpers
+
+  # Set this constant to true if this migration requires downtime.
+  DOWNTIME = false
+
+  def up
+    execute "UPDATE pool_repositories SET source_project_id = (SELECT MIN(id) FROM projects WHERE pool_repository_id = pool_repositories.id) WHERE pool_repositories.source_project_id IS NULL"
+  end
+
+  def down
+    # nothing to do her
+  end
+end

doc/integration/jenkins.md

@@ -19,8 +19,8 @@ GitLab's Jenkins integration allows you to trigger a Jenkins build when you
 push code to a repository, or when a merge request is created. Additionally,
 it shows the pipeline status on merge requests widgets and on the project's home page.
 
-<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
-For a video overview, see [Migrating from Jenkins to GitLab](https://www.youtube.com/watch?v=RlEVGOpYF5Y).
+Videos are also available on [GitLab workflow with Jira issues and Jenkins pipelines](https://youtu.be/Jn-_fyra7xQ)
+and [Migrating from Jenkins to GitLab](https://www.youtube.com/watch?v=RlEVGOpYF5Y).
 
 ## Use cases
 

doc/user/project/integrations/jira.md

@@ -8,6 +8,8 @@ While you can always migrate content and process from Jira to GitLab Issues,
 you can also opt to continue using Jira and use it together with GitLab through
 our integration.
 
+For a video demonstration of integration with Jira, watch [GitLab workflow with Jira issues and Jenkins pipelines](https://youtu.be/Jn-_fyra7xQ).
+
 Once you integrate your GitLab project with your Jira instance, you can automatically
 detect and cross-reference activity between the GitLab project and any of your projects
 in Jira. This includes the ability to close or transition Jira issues when the work

lib/gitlab/omniauth_initializer.rb

@@ -65,12 +65,6 @@ module Gitlab
         { remote_sign_out_handler: authentiq_signout_handler }
       when 'shibboleth'
         { fail_with_empty_uid: true }
-      when 'openid_connect'
-        # If a name argument is omitted, OmniAuth will expect that the
-        # matching route is /auth/users/openidconnect instead of
-        # /auth/users/openid_connect because of
-        # https://gitlab.com/gitlab-org/gitlab-ce/issues/62208#note_178780341.
-        { name: 'openid_connect' }
       else
         {}
       end

spec/lib/gitlab/omniauth_initializer_spec.rb

@@ -83,13 +83,5 @@ describe Gitlab::OmniauthInitializer do
 
       subject.execute([cas3_config])
     end
-
-    it 'configures name for openid_connect' do
-      openid_connect_config = { 'name' => 'openid_connect', 'args' => {} }
-
-      expect(devise_config).to receive(:omniauth).with(:openid_connect, name: 'openid_connect')
-
-      subject.execute([openid_connect_config])
-    end
   end
 end

spec/migrations/fix_pool_repository_source_project_id_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+require Rails.root.join('db', 'migrate', '20190604184643_fix_pool_repository_source_project_id.rb')
+
+describe FixPoolRepositorySourceProjectId, :migration do
+  let(:projects) { table(:projects) }
+  let(:pool_repositories) { table(:pool_repositories) }
+  let(:shards) { table(:shards) }
+
+  it 'fills in source_project_ids' do
+    shard = shards.create!(name: 'default')
+
+    # gitaly is a project with a pool repository that has a source_project_id
+    gitaly = projects.create!(name: 'gitaly', path: 'gitlab-org/gitaly', namespace_id: 1)
+    pool_repository = pool_repositories.create(shard_id: shard.id, source_project_id: gitaly.id)
+    gitaly.update_column(:pool_repository_id, pool_repository.id)
+
+    # gitlab is a project with a pool repository that's missing a source_project_id
+    pool_repository_without_source_project = pool_repositories.create(shard_id: shard.id, source_project_id: nil)
+    gitlab = projects.create!(name: 'gitlab', path: 'gitlab-org/gitlab-ce', namespace_id: 1, pool_repository_id: pool_repository_without_source_project.id)
+    projects.create!(name: 'gitlab-fork-1', path: 'my-org-1/gitlab-ce', namespace_id: 1, pool_repository_id: pool_repository_without_source_project.id)
+
+    migrate!
+
+    expect(pool_repositories.find(pool_repository_without_source_project.id).source_project_id).to eq(gitlab.id)
+    expect(pool_repositories.find(pool_repository.id).source_project_id).to eq(gitaly.id)
+  end
+end