Commit fbdbc0ba authored by Lin Jen-Shin's avatar Lin Jen-Shin

Resolve conflicts

parent ba826770
...@@ -184,7 +184,6 @@ ...@@ -184,7 +184,6 @@
} }
} }
<<<<<<< HEAD
.nested-settings { .nested-settings {
padding-left: 20px; padding-left: 20px;
} }
...@@ -210,8 +209,6 @@ ...@@ -210,8 +209,6 @@
} }
} }
=======
>>>>>>> upstream/master
.prometheus-metrics-monitoring { .prometheus-metrics-monitoring {
.panel { .panel {
.panel-toggle { .panel-toggle {
......
...@@ -2,11 +2,8 @@ module ApplicationSettingsHelper ...@@ -2,11 +2,8 @@ module ApplicationSettingsHelper
prepend EE::ApplicationSettingsHelper prepend EE::ApplicationSettingsHelper
extend self extend self
<<<<<<< HEAD
=======
include Gitlab::CurrentSettings include Gitlab::CurrentSettings
>>>>>>> upstream/master
delegate :gravatar_enabled?, delegate :gravatar_enabled?,
:signup_enabled?, :signup_enabled?,
:password_authentication_enabled?, :password_authentication_enabled?,
......
...@@ -131,19 +131,11 @@ class Group < Namespace ...@@ -131,19 +131,11 @@ class Group < Namespace
def visibility_level_allowed_by_projects?(level = self.visibility_level) def visibility_level_allowed_by_projects?(level = self.visibility_level)
!projects.where('visibility_level > ?', level).exists? !projects.where('visibility_level > ?', level).exists?
end end
<<<<<<< HEAD
def visibility_level_allowed_by_sub_groups?(level = self.visibility_level) def visibility_level_allowed_by_sub_groups?(level = self.visibility_level)
!children.where('visibility_level > ?', level).exists? !children.where('visibility_level > ?', level).exists?
end end
=======
def visibility_level_allowed_by_sub_groups?(level = self.visibility_level)
!children.where('visibility_level > ?', level).exists?
end
>>>>>>> upstream/master
def visibility_level_allowed?(level = self.visibility_level) def visibility_level_allowed?(level = self.visibility_level)
visibility_level_allowed_by_parent?(level) && visibility_level_allowed_by_parent?(level) &&
visibility_level_allowed_by_projects?(level) && visibility_level_allowed_by_projects?(level) &&
......
...@@ -969,13 +969,12 @@ class MergeRequest < ActiveRecord::Base ...@@ -969,13 +969,12 @@ class MergeRequest < ActiveRecord::Base
true true
end end
<<<<<<< HEAD
def base_pipeline def base_pipeline
@base_pipeline ||= project.pipelines.find_by(sha: merge_request_diff&.base_commit_sha) @base_pipeline ||= project.pipelines.find_by(sha: merge_request_diff&.base_commit_sha)
======= end
def update_project_counter_caches? def update_project_counter_caches?
state_changed? state_changed?
>>>>>>> upstream/master
end end
def update_project_counter_caches def update_project_counter_caches
......
module Users module Users
class BuildService < BaseService class BuildService < BaseService
<<<<<<< HEAD
prepend ::EE::Users::BuildService prepend ::EE::Users::BuildService
=======
include Gitlab::CurrentSettings include Gitlab::CurrentSettings
>>>>>>> upstream/master
def initialize(current_user, params = {}) def initialize(current_user, params = {})
@current_user = current_user @current_user = current_user
......
...@@ -41,10 +41,7 @@ do. ...@@ -41,10 +41,7 @@ do.
| `/clear_weight` | Clears the issue weight | | `/clear_weight` | Clears the issue weight |
| `/board_move ~column` | Move issue to column on the board | | `/board_move ~column` | Move issue to column on the board |
| `/duplicate #issue` | Closes this issue and marks it as a duplicate of another issue | | `/duplicate #issue` | Closes this issue and marks it as a duplicate of another issue |
<<<<<<< HEAD | `/move path/to/project` | Moves issue to another project |
Note: In GitLab EES every issue can have more than one assignee, so commands `/assign`, `/unassign` and `/reassign` Note: In GitLab EES every issue can have more than one assignee, so commands `/assign`, `/unassign` and `/reassign`
support multiple assignees. support multiple assignees.
=======
| `/move path/to/project` | Moves issue to another project |
>>>>>>> upstream/master
...@@ -17,11 +17,7 @@ class Spinach::Features::ProjectRedirects < Spinach::FeatureSteps ...@@ -17,11 +17,7 @@ class Spinach::Features::ProjectRedirects < Spinach::FeatureSteps
end end
step 'I should see project "Community" home page' do step 'I should see project "Community" home page' do
<<<<<<< HEAD
expect(Gitlab.config.gitlab).to receive(:host).and_return("www.example.com")
=======
Gitlab.config.gitlab.should_receive(:host).and_return("www.example.com") Gitlab.config.gitlab.should_receive(:host).and_return("www.example.com")
>>>>>>> upstream/master
page.within '.breadcrumbs .title' do page.within '.breadcrumbs .title' do
expect(page).to have_content 'Community' expect(page).to have_content 'Community'
end end
......
module API module API
module Helpers module Helpers
module Runner module Runner
<<<<<<< HEAD
prepend EE::API::Helpers::Runner prepend EE::API::Helpers::Runner
=======
include Gitlab::CurrentSettings include Gitlab::CurrentSettings
>>>>>>> upstream/master
JOB_TOKEN_HEADER = 'HTTP_JOB_TOKEN'.freeze JOB_TOKEN_HEADER = 'HTTP_JOB_TOKEN'.freeze
JOB_TOKEN_PARAM = :token JOB_TOKEN_PARAM = :token
......
...@@ -19,11 +19,8 @@ module Gitlab ...@@ -19,11 +19,8 @@ module Gitlab
OPTIONAL_SCOPES = (AVAILABLE_SCOPES + OPENID_SCOPES - DEFAULT_SCOPES).freeze OPTIONAL_SCOPES = (AVAILABLE_SCOPES + OPENID_SCOPES - DEFAULT_SCOPES).freeze
class << self class << self
<<<<<<< HEAD
prepend EE::Gitlab::Auth prepend EE::Gitlab::Auth
=======
include Gitlab::CurrentSettings include Gitlab::CurrentSettings
>>>>>>> upstream/master
def find_for_git_client(login, password, project:, ip:) def find_for_git_client(login, password, project:, ip:)
raise "Must provide an IP for rate limiting" if ip.nil? raise "Must provide an IP for rate limiting" if ip.nil?
......
...@@ -1224,7 +1224,6 @@ describe QuickActions::InterpretService do ...@@ -1224,7 +1224,6 @@ describe QuickActions::InterpretService do
end end
end end
<<<<<<< HEAD
# EE-specific tests # EE-specific tests
describe 'weight command' do describe 'weight command' do
...@@ -1233,7 +1232,9 @@ describe QuickActions::InterpretService do ...@@ -1233,7 +1232,9 @@ describe QuickActions::InterpretService do
it 'includes the number' do it 'includes the number' do
_, explanations = service.explain(content, issue) _, explanations = service.explain(content, issue)
expect(explanations).to eq(['Sets weight to 4.']) expect(explanations).to eq(['Sets weight to 4.'])
======= end
end
describe 'move issue to another project command' do describe 'move issue to another project command' do
let(:content) { '/move test/project' } let(:content) { '/move test/project' }
...@@ -1241,7 +1242,6 @@ describe QuickActions::InterpretService do ...@@ -1241,7 +1242,6 @@ describe QuickActions::InterpretService do
_, explanations = service.explain(content, issue) _, explanations = service.explain(content, issue)
expect(explanations).to eq(["Moves this issue to test/project."]) expect(explanations).to eq(["Moves this issue to test/project."])
>>>>>>> upstream/master
end end
end end
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