Commit 32af0108 authored by Yorick Peterse's avatar Yorick Peterse

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

parents cf40530e 02f36f4f
Pipeline #46223135 failed with stages
in 8 minutes and 42 seconds
<<<<<<< HEAD
1.17.0
=======
1.14.1
>>>>>>> dev/master
......@@ -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
......
......@@ -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
......@@ -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
......
# 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"
......
......@@ -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
......
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
......
......@@ -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 }
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment