Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-25

# Conflicts:
#	app/models/project_feature.rb
#	db/schema.rb

[ci skip]

Gemfile

@@ -412,6 +412,7 @@ gem 'email_reply_trimmer', '~> 0.1'
 gem 'html2text'
 
 gem 'ruby-prof', '~> 0.17.0'
+gem 'rbtrace', '~> 0.4', require: false
 
 # OAuth
 gem 'oauth2', '~> 1.4'

Gemfile.lock

@@ -729,6 +729,10 @@ GEM
       ffi (>= 0.5.0, < 2)
     rblineprof (0.3.6)
       debugger-ruby_core_source (~> 1.3)
+    rbtrace (0.4.10)
+      ffi (>= 1.0.6)
+      msgpack (>= 0.4.3)
+      trollop (>= 1.16.2)
     rdoc (6.0.4)
     re2 (1.1.1)
     recaptcha (3.0.0)
@@ -940,6 +944,7 @@ GEM
       parslet (~> 1.5.0)
     toml-rb (1.0.0)
       citrus (~> 3.0, > 3.0)
+    trollop (2.1.3)
     truncato (0.7.10)
       htmlentities (~> 4.3.1)
       nokogiri (~> 1.8.0, >= 1.7.0)
@@ -1170,6 +1175,7 @@ DEPENDENCIES
   rainbow (~> 2.2)
   raindrops (~> 0.18)
   rblineprof (~> 0.3.6)
+  rbtrace (~> 0.4)
   rdoc (~> 6.0)
   re2 (~> 1.1.1)
   recaptcha (~> 3.0)

Gemfile.rails5.lock

@@ -738,6 +738,10 @@ GEM
       ffi (>= 0.5.0, < 2)
     rblineprof (0.3.6)
       debugger-ruby_core_source (~> 1.3)
+    rbtrace (0.4.10)
+      ffi (>= 1.0.6)
+      msgpack (>= 0.4.3)
+      trollop (>= 1.16.2)
     rdoc (6.0.4)
     re2 (1.1.1)
     recaptcha (3.0.0)
@@ -947,6 +951,7 @@ GEM
       parslet (~> 1.5.0)
     toml-rb (1.0.0)
       citrus (~> 3.0, > 3.0)
+    trollop (2.1.3)
     truncato (0.7.10)
       htmlentities (~> 4.3.1)
       nokogiri (~> 1.8.0, >= 1.7.0)
@@ -1181,6 +1186,7 @@ DEPENDENCIES
   rainbow (~> 2.2)
   raindrops (~> 0.18)
   rblineprof (~> 0.3.6)
+  rbtrace (~> 0.4)
   rdoc (~> 6.0)
   re2 (~> 1.1.1)
   recaptcha (~> 3.0)

app/assets/stylesheets/pages/login.scss

@@ -237,7 +237,7 @@
     }
 
     .login-page-broadcast {
-      margin-top: 50px;
+      margin-top: 40px;
     }
 
     .navless-container {

app/models/email.rb

@@ -25,6 +25,10 @@ class Email < ActiveRecord::Base
     self.errors.add(:email, 'has already been taken') if User.exists?(email: self.email)
   end
 
+  def accept_pending_invitations!
+    user.accept_pending_invitations!
+  end
+
   # once email is confirmed, update the gpg signatures
   def update_invalid_gpg_signatures
     user.update_invalid_gpg_signatures if confirmed?

app/models/project_feature.rb

@@ -53,12 +53,15 @@ class ProjectFeature < ActiveRecord::Base
   default_value_for :wiki_access_level,           value: ENABLED, allows_nil: false
   default_value_for :repository_access_level,     value: ENABLED, allows_nil: false
 
+<<<<<<< HEAD
   after_commit on: :update do
     if Gitlab::CurrentSettings.current_application_settings.elasticsearch_indexing?
       ElasticIndexerWorker.perform_async(:update, 'Project', project_id)
     end
   end
 
+=======
+>>>>>>> upstream/master
   after_create ->(model) { SiteStatistic.track(STATISTICS_ATTRIBUTE) if model.wiki_enabled? }
   after_update :update_site_statistics
 

changelogs/unreleased/49364-fix-broadcast-margin.yml

+---
+title: Fix misalignment of broadcast message on login page
+merge_request: 20794
+author: Robin Naundorf
+type: fixed

changelogs/unreleased/ce-6064-geo-sql-query-for-counting-projects-with-wikis-is-very-slow.yml

+---
+title: Tracking the number of repositories and wikis with a cached counter for site-wide statistics
+merge_request: 20413
+author:
+type: performance

changelogs/unreleased/fix-email-confirmation-addtional-email.yml

+---
+title: Fix email confirmation bug when user adds additional email to account
+merge_request: 20084
+author: muhammadn
+type: fixed

changelogs/unreleased/sh-include-rbtrace.yml

+---
+title: Add rbtrace to Gemfile
+merge_request: 20831
+author:
+type: other

config/initializers/rbtrace.rb

+# frozen_string_literal: true
+
+require 'rbtrace' if ENV['ENABLE_RBTRACE']

db/schema.rb

@@ -2411,6 +2411,7 @@ ActiveRecord::Schema.define(version: 20180722103201) do
     t.integer "wikis_count", default: 0, null: false
   end
 
+<<<<<<< HEAD
   create_table "slack_integrations", force: :cascade do |t|
     t.integer "service_id", null: false
     t.string "team_id", null: false
@@ -2424,6 +2425,8 @@ ActiveRecord::Schema.define(version: 20180722103201) do
   add_index "slack_integrations", ["service_id"], name: "index_slack_integrations_on_service_id", using: :btree
   add_index "slack_integrations", ["team_id", "alias"], name: "index_slack_integrations_on_team_id_and_alias", unique: true, using: :btree
 
+=======
+>>>>>>> upstream/master
   create_table "snippets", force: :cascade do |t|
     t.string "title"
     t.text "content"

doc/administration/troubleshooting/debug.md

@@ -66,6 +66,19 @@ On CentOS:
 sudo yum install gdb
 ```
 
+### rbtrace
+
+GitLab 11.2 ships with [rbtrace](https://github.com/tmm1/rbtrace), which
+allows you to trace Ruby code, view all running threads, take memory dumps,
+and more. However, this is not enabled by default. To enable it, define the
+`ENABLE_RBTRACE` variable to the environment. For example, in Omnibus:
+
+```ruby
+gitlab_rails['env'] = {"ENABLE_RBTRACE" => "1"}
+```
+
+Then reconfigure the system and restart Unicorn and Sidekiq.
+
 ## Common Problems
 
 Many of the tips to diagnose issues below apply to many different situations. We'll use one

spec/features/users/add_email_to_existing_account.rb

+require 'spec_helper'
+
+describe 'AdditionalEmailToExistingAccount' do
+  describe 'add secondary email associated with account' do
+    let(:user) { create(:user) }
+
+    it 'verifies confirmation of additional email' do
+      sign_in(user)
+
+      email = create(:email, user: user)
+      visit email_confirmation_path(confirmation_token: email.confirmation_token)
+      expect(page).to have_content 'Your email address has been successfully confirmed.'
+    end
+  end
+end