Commit bc0f3e59 authored by Clement Ho's avatar Clement Ho

Resolve conflicts

parent bdc1a8b5
Pipeline #9197654 failed with stages
in 172 minutes and 24 seconds
......@@ -13,23 +13,8 @@ module Gitlab
scope :public_and_internal_only, -> { where(visibility_level: [PUBLIC, INTERNAL] ) }
scope :non_public_only, -> { where.not(visibility_level: PUBLIC) }
<<<<<<< HEAD
scope :public_to_user, -> (user) do
if user
if user.admin_or_auditor?
all
elsif !user.external?
public_and_internal_only
else
public_only
end
else
public_only
end
=======
scope :public_to_user, -> (user = nil) do
where(visibility_level: VisibilityLevel.levels_for_user(user))
>>>>>>> gitlab-ce/9-3-stable-rc6
end
end
......
......@@ -8,13 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-06-19 19:46+0200\n"
"PO-Revision-Date: 2017-06-19 19:46+0200\n"
=======
"POT-Creation-Date: 2017-06-19 15:13-0500\n"
"PO-Revision-Date: 2017-06-19 15:13-0500\n"
>>>>>>> gitlab-ce/9-3-stable-rc6
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
......
......@@ -79,7 +79,6 @@ feature 'Merge Request closing issues message', feature: true, js: true do
it 'does not display closing issue message' do
expect(page).to have_content("Closes issue #{issue_1.to_reference}. Issue #{issue_2.to_reference} is mentioned but will not be closed.")
expect(page).to have_content("Issue #{issue_2.to_reference} is mentioned but will not be closed.")
<<<<<<< HEAD
end
end
......@@ -94,8 +93,6 @@ feature 'Merge Request closing issues message', feature: true, js: true do
it 'displays closing issue message exactly one time' do
wait_for_requests
expect(page).to have_content("Closes issues #{issue_1.to_reference} and #{issue_2.to_reference}", count: 1)
=======
>>>>>>> gitlab-ce/9-3-stable-rc6
end
end
end
......@@ -18,7 +18,6 @@ describe('MergeRequestStore', () => {
store.setData({ ...mockData, work_in_progress: !mockData.work_in_progress });
expect(store.hasSHAChanged).toBe(false);
});
<<<<<<< HEAD
});
describe('setCodeclimateHeadMetrics', () => {
......@@ -60,7 +59,5 @@ describe('MergeRequestStore', () => {
it('should return the resolved issues', () => {
expect(store.codeclimateMetrics.resolvedIssues[0]).toEqual(baseIssues[1]);
});
=======
>>>>>>> gitlab-ce/9-3-stable-rc6
});
});
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