Merge dev.gitlab.org master into GitLab.com master

10 files changed, 38 insertions, 0 deletions

diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 092afa15df4..a020d806b29 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1,5 @@
+<<<<<<< HEAD
 1.17.0
+=======
+1.14.1
+>>>>>>> dev/master
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index f9a80aa3cfb..f9604302e28 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -246,7 +246,11 @@ class Projects::IssuesController < Projects::ApplicationController
       task_num
       lock_version
       discussion_locked
+<<<<<<< HEAD
     ] + [{ label_ids: [], assignee_ids: [], update_task: [:index, :checked, :line_number, :line_source] }]
+=======
+    ] + [{ label_ids: [], assignee_ids: [] }]
+>>>>>>> dev/master
   end
 
   def store_uri
diff --git a/app/policies/personal_snippet_policy.rb b/app/policies/personal_snippet_policy.rb
index 2b5cca76c20..8ff17ba291a 100644
--- a/app/policies/personal_snippet_policy.rb
+++ b/app/policies/personal_snippet_policy.rb
@@ -32,6 +32,9 @@ class PersonalSnippetPolicy < BasePolicy
     enable :create_note
     enable :award_emoji
   end
+<<<<<<< HEAD
 
   rule { full_private_access }.enable :read_personal_snippet
+=======
+>>>>>>> dev/master
 end
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml
index dd7833647b7..bfc9f512a12 100644
--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/app/views/layouts/nav/sidebar/_project.html.haml
@@ -284,7 +284,11 @@
       - if project_nav_tab?(:wiki)
         - wiki_url = project_wiki_path(@project, :home)
         = nav_link(controller: :wikis) do
+<<<<<<< HEAD
           = link_to wiki_url, class: 'shortcuts-wiki qa-wiki-link' do
+=======
+          = link_to wiki_url, class: 'shortcuts-wiki' do
+>>>>>>> dev/master
             .nav-icon-container
               = sprite_icon('book')
             %span.nav-item-name
diff --git a/config/routes/import.rb b/config/routes/import.rb
index da5c31d0062..cd7e1ee749f 100644
--- a/config/routes/import.rb
+++ b/config/routes/import.rb
@@ -1,7 +1,11 @@
 # Alias import callbacks under the /users/auth endpoint so that
 # the OAuth2 callback URL can be restricted under http://example.com/users/auth
 # instead of http://example.com.
+<<<<<<< HEAD
 Devise.omniauth_providers.map(&:downcase).each do |provider|
+=======
+Devise.omniauth_providers.each do |provider|
+>>>>>>> dev/master
   next if provider == 'ldapmain'
 
   get "/users/auth/-/import/#{provider}/callback", to: "import/#{provider}#callback", as: "users_import_#{provider}_callback"
diff --git a/lib/banzai/pipeline/email_pipeline.rb b/lib/banzai/pipeline/email_pipeline.rb
index 13e6a990407..7c959fe17e1 100644
--- a/lib/banzai/pipeline/email_pipeline.rb
+++ b/lib/banzai/pipeline/email_pipeline.rb
@@ -12,8 +12,12 @@ module Banzai
       def self.transform_context(context)
         super(context).merge(
           only_path: false,
+<<<<<<< HEAD
           emailable_links: true,
           no_sourcepos: true
+=======
+          emailable_links: true
+>>>>>>> dev/master
         )
       end
     end
diff --git a/spec/features/markdown/math_spec.rb b/spec/features/markdown/math_spec.rb
index 16ad0d456be..310e6a7171d 100644
--- a/spec/features/markdown/math_spec.rb
+++ b/spec/features/markdown/math_spec.rb
@@ -1,7 +1,11 @@
 require 'spec_helper'
 
 describe 'Math rendering', :js do
+<<<<<<< HEAD
   let!(:project) { create(:project, :public) }
+=======
+  let!(:project)   { create(:project, :public) }
+>>>>>>> dev/master
 
   it 'renders inline and display math correctly' do
     description = <<~MATH
diff --git a/spec/lib/safe_zip/extract_spec.rb b/spec/lib/safe_zip/extract_spec.rb
index b75a8fede00..9c9a3f2fe93 100644
--- a/spec/lib/safe_zip/extract_spec.rb
+++ b/spec/lib/safe_zip/extract_spec.rb
@@ -36,7 +36,11 @@ describe SafeZip::Extract do
       end
     end
 
+<<<<<<< HEAD
     %w(valid-simple.zip valid-symlinks-first.zip valid-non-writeable.zip).each do |name|
+=======
+    %w(valid-simple.zip valid-symlinks-first.zip valid-non-writeable.zip).each  do |name|
+>>>>>>> dev/master
       context "when using #{name} archive" do
         let(:archive_name) { name }
 
diff --git a/spec/policies/personal_snippet_policy_spec.rb b/spec/policies/personal_snippet_policy_spec.rb
index a38e0dbd797..9496fb4f562 100644
--- a/spec/policies/personal_snippet_policy_spec.rb
+++ b/spec/policies/personal_snippet_policy_spec.rb
@@ -130,6 +130,7 @@ describe PersonalSnippetPolicy do
       it do
         is_expected.to be_disallowed(:read_personal_snippet)
         is_expected.to be_disallowed(*comment_permissions)
+<<<<<<< HEAD
         is_expected.to be_disallowed(:award_emoji)
         is_expected.to be_disallowed(*author_permissions)
       end
@@ -141,6 +142,8 @@ describe PersonalSnippetPolicy do
       it do
         is_expected.to be_allowed(:read_personal_snippet)
         is_expected.to be_disallowed(:comment_personal_snippet)
+=======
+>>>>>>> dev/master
         is_expected.to be_disallowed(:award_emoji)
         is_expected.to be_disallowed(*author_permissions)
       end
diff --git a/spec/services/members/destroy_service_spec.rb b/spec/services/members/destroy_service_spec.rb
index d37ca13ebd2..57bf2606853 100644
--- a/spec/services/members/destroy_service_spec.rb
+++ b/spec/services/members/destroy_service_spec.rb
@@ -168,7 +168,11 @@ describe Members::DestroyService do
       end
 
       it_behaves_like 'a service destroying a member' do
+<<<<<<< HEAD
         let(:opts) { { skip_authorization: true, skip_subresources: true } }
+=======
+        let(:opts) { { skip_authorization: true, skip_subresources: true  } }
+>>>>>>> dev/master
         let(:member) { group.requesters.find_by(user_id: member_user.id) }
       end
     end