Commit fb5943d8 authored by Valery Sizov's avatar Valery Sizov

Resolve conflicts

parent b4fbb71a
......@@ -324,10 +324,7 @@ Example of response
## Get job artifacts
> **Notes**:
<<<<<<< HEAD
=======
>
>>>>>>> upstream/master
> - [Introduced][ce-2893] in GitLab 8.5.
> - The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced][ee-2346]
> in [GitLab Premium][ee] 9.5.
......@@ -376,10 +373,7 @@ Response:
## Download the artifacts archive
> **Notes**:
<<<<<<< HEAD
=======
>
>>>>>>> upstream/master
> - [Introduced][ce-5347] in GitLab 8.10.
> - The use of `CI_JOB_TOKEN` in the artifacts download API was [introduced][ee-2346]
> in [GitLab Premium][ee] 9.5.
......
......@@ -47,7 +47,6 @@ do.
| `/shrug` | Append the comment with `¯\_(ツ)_/¯` |
| <code>/copy_metadata #issue &#124; !merge_request</code> | Copy labels and milestone from other issue or merge request |
| `/confidential` | Makes the issue confidential |
<<<<<<< HEAD
| `/epic <group&epic | Epic URL>` | Adds an issue to an epic |
| `/remove_epic` | Removes an issue from an epic |
| `/lock` | Lock the discussion |
......@@ -55,7 +54,3 @@ do.
Note: In GitLab Starter every issue can have more than one assignee, so commands `/assign`, `/unassign` and `/reassign`
support multiple assignees.
=======
| `/lock` | Lock the discussion |
| `/unlock` | Unlock the discussion |
>>>>>>> upstream/master
......@@ -871,7 +871,6 @@ describe QuickActions::InterpretService do
let(:issuable) { merge_request }
end
<<<<<<< HEAD
context 'issuable weights licensed' do
before do
stub_licensed_features(issue_weights: true)
......@@ -906,8 +905,6 @@ describe QuickActions::InterpretService do
end
end
=======
>>>>>>> upstream/master
context '/todo' do
let(:content) { '/todo' }
......
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