Commit 22d0696d authored by GitLab Bot's avatar GitLab Bot

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-01

# Conflicts:
#	lib/gitlab/upgrader.rb
#	spec/finders/group_projects_finder_spec.rb
#	spec/finders/issues_finder_spec.rb
#	spec/finders/merge_requests_finder_spec.rb
#	spec/uploaders/job_artifact_uploader_spec.rb

[ci skip]
parents 9562cd14 498d3236
/* eslint-disable class-methods-use-this */
import _ from 'underscore';
import Cookies from 'js-cookie';
import { s__ } from './locale';
import { __ } from './locale';
import { isInIssuePage, updateTooltipTitle } from './lib/utils/common_utils';
import flash from './flash';
import axios from './lib/utils/axios_utils';
......@@ -451,7 +451,7 @@ class AwardsHandler {
callback();
}
})
.catch(() => flash(s__('Something went wrong on our end.')));
.catch(() => flash(__('Something went wrong on our end.')));
}
}
......
......@@ -48,7 +48,11 @@ module Gitlab
end
def fetch_git_tags
<<<<<<< HEAD
remote_tags, _ = Gitlab::Popen.popen(%W(#{Gitlab.config.git.bin_path} ls-remote --tags https://gitlab.com/gitlab-org/gitlab-ee.git))
=======
remote_tags, _ = Gitlab::Popen.popen(%W(#{Gitlab.config.git.bin_path} ls-remote --tags https://gitlab.com/gitlab-org/gitlab-ce.git))
>>>>>>> upstream/master
remote_tags.split("\n").grep(%r{tags/v#{current_version.major}})
end
......
......@@ -126,6 +126,7 @@ describe GroupProjectsFinder do
context 'without subgroups projects' do
it { is_expected.to eq([public_project]) }
end
<<<<<<< HEAD
end
end
......@@ -140,6 +141,8 @@ describe GroupProjectsFinder do
context 'without subgroups projects' do
it { is_expected.to match_array([shared_project_3, shared_project_2, shared_project_1, public_project]) }
=======
>>>>>>> upstream/master
end
end
end
......@@ -158,6 +161,7 @@ describe GroupProjectsFinder do
end
context "all" do
<<<<<<< HEAD
it { is_expected.to eq([shared_project_3, shared_project_2, shared_project_1, private_project, public_project]) }
end
end
......@@ -178,6 +182,19 @@ describe GroupProjectsFinder do
context "all" do
subject { described_class.new(group: group, current_user: current_user).execute }
it { is_expected.to eq([shared_project_3, shared_project_2, shared_project_1, private_project, public_project]) }
=======
context 'with subgroups projects', :nested_groups do
before do
options[:include_subgroups] = true
end
it { is_expected.to match_array([shared_project_3, shared_project_2, shared_project_1, public_project, subgroup_project]) }
end
context 'without subgroups projects' do
it { is_expected.to match_array([shared_project_3, shared_project_2, shared_project_1, public_project]) }
end
>>>>>>> upstream/master
end
end
......
......@@ -46,6 +46,7 @@ describe IssuesFinder do
it 'returns all issues' do
expect(issues).to contain_exactly(issue1, issue2, issue3, issue4)
<<<<<<< HEAD
end
context 'sort by issues with no weight' do
......@@ -62,6 +63,8 @@ describe IssuesFinder do
it 'returns all issues' do
expect(issues).to be_empty
end
=======
>>>>>>> upstream/master
end
context 'filtering by assignee ID' do
......@@ -72,6 +75,7 @@ describe IssuesFinder do
end
end
<<<<<<< HEAD
context 'filtering by assignee IDs' do
set(:user3) { create(:user) }
let(:params) { { assignee_ids: [user2.id, user3.id] } }
......@@ -102,6 +106,8 @@ describe IssuesFinder do
end
end
=======
>>>>>>> upstream/master
context 'filtering by group_id' do
let(:params) { { group_id: group.id } }
......
......@@ -44,12 +44,15 @@ describe MergeRequestsFinder do
expect(merge_requests.size).to eq(1)
end
<<<<<<< HEAD
it 'ignores sorting by weight' do
params = { project_id: project1.id, scope: 'authored', state: 'opened', weight: Issue::WEIGHT_ANY }
merge_requests = described_class.new(user, params).execute
expect(merge_requests.size).to eq(1)
end
=======
>>>>>>> upstream/master
it 'filters by group' do
params = { group_id: group.id }
......
......@@ -14,6 +14,7 @@ describe JobArtifactUploader do
context 'when using local storage' do
it { is_expected.to start_with(local_path) }
it { is_expected.to match(%r{\h{2}/\h{2}/\h{64}/\d{4}_\d{1,2}_\d{1,2}/\d+/\d+\z}) }
<<<<<<< HEAD
it { is_expected.to end_with(path) }
end
......@@ -25,6 +26,8 @@ describe JobArtifactUploader do
end
it { is_expected.to match(%r{\h{2}/\h{2}/\h{64}/\d{4}_\d{1,2}_\d{1,2}/\d+/\d+\z}) }
=======
>>>>>>> upstream/master
it { is_expected.to end_with(path) }
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