diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb
index dad19a385fc661cdd2eb403127553d6b3ecc638b..aabf13154e92b094026d12780ae21526c93cad1c 100644
--- a/app/helpers/system_note_helper.rb
+++ b/app/helpers/system_note_helper.rb
@@ -20,13 +20,10 @@ module SystemNoteHelper
'moved' => 'arrow-right',
'outdated' => 'pencil',
'duplicate' => 'issue-duplicate',
-<<<<<<< HEAD
'approved' => 'approval',
'unapproved' => 'unapproval',
'relate' => 'link',
'unrelate' => 'unlink',
-=======
->>>>>>> ce-com/master
'locked' => 'lock',
'unlocked' => 'lock-open'
}.freeze
diff --git a/doc/api/issues.md b/doc/api/issues.md
index 48258b0c4a8dcafc2064281b7346d5d2c43ba500..e68817376e71df70fd43b8ce7325fa1c5b7fd746 100644
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
@@ -106,14 +106,13 @@ Example response:
"web_url": "http://example.com/example/example/issues/6",
"confidential": false,
"weight": null,
+ "discussion_locked": false,
"time_stats": {
"time_estimate": 0,
"total_time_spent": 0,
"human_time_estimate": null,
"human_total_time_spent": null
},
- "confidential": false,
- "discussion_locked": false
}
]
```
@@ -215,14 +214,13 @@ Example response:
"web_url": "http://example.com/example/example/issues/1",
"confidential": false,
"weight": null,
+ "discussion_locked": false,
"time_stats": {
"time_estimate": 0,
"total_time_spent": 0,
"human_time_estimate": null,
"human_total_time_spent": null
},
- "confidential": false,
- "discussion_locked": false
}
]
```
@@ -325,14 +323,13 @@ Example response:
"web_url": "http://example.com/example/example/issues/1",
"confidential": false,
"weight": null,
+ "discussion_locked": false,
"time_stats": {
"time_estimate": 0,
"total_time_spent": 0,
"human_time_estimate": null,
"human_total_time_spent": null
},
- "confidential": false,
- "discussion_locked": false
}
]
```
@@ -416,10 +413,7 @@ Example response:
"human_total_time_spent": null
},
"confidential": false,
-<<<<<<< HEAD
"weight": null,
-=======
->>>>>>> ce-com/master
"discussion_locked": false,
"_links": {
"self": "http://example.com/api/v4/projects/1/issues/2",
@@ -497,10 +491,7 @@ Example response:
"human_total_time_spent": null
},
"confidential": false,
-<<<<<<< HEAD
"weight": null,
-=======
->>>>>>> ce-com/master
"discussion_locked": false,
"_links": {
"self": "http://example.com/api/v4/projects/1/issues/2",
@@ -535,13 +526,8 @@ PUT /projects/:id/issues/:issue_iid
| `state_event` | string | no | The state event of an issue. Set `close` to close the issue and `reopen` to reopen it |
| `updated_at` | string | no | Date time string, ISO 8601 formatted, e.g. `2016-03-11T03:45:40Z` (requires admin or project owner rights) |
| `due_date` | string | no | Date time string in the format YEAR-MONTH-DAY, e.g. `2016-03-11` |
-<<<<<<< HEAD
| `weight` | integer | no | The weight of the issue in range 0 to 9 |
| `discussion_locked` | boolean | no | Flag indicating if the issue's discussion is locked. If the discussion is locked only project members can add or edit comments. |
-=======
-| `discussion_locked` | boolean | no | Flag indicating if the issue's discussion is locked. If the discussion is locked only project members can add or edit comments. |
-
->>>>>>> ce-com/master
```bash
curl --request PUT --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/projects/4/issues/85?state_event=close
@@ -585,10 +571,7 @@ Example response:
"human_total_time_spent": null
},
"confidential": false,
-<<<<<<< HEAD
"weight": null,
-=======
->>>>>>> ce-com/master
"discussion_locked": false,
"_links": {
"self": "http://example.com/api/v4/projects/1/issues/2",
@@ -689,10 +672,7 @@ Example response:
"human_total_time_spent": null
},
"confidential": false,
-<<<<<<< HEAD
"weight": null,
-=======
->>>>>>> ce-com/master
"discussion_locked": false,
"_links": {
"self": "http://example.com/api/v4/projects/1/issues/2",
@@ -772,10 +752,7 @@ Example response:
"human_total_time_spent": null
},
"confidential": false,
-<<<<<<< HEAD
"weight": null,
-=======
->>>>>>> ce-com/master
"discussion_locked": false,
"_links": {
"self": "http://example.com/api/v4/projects/1/issues/2",
@@ -938,10 +915,7 @@ Example response:
"due_date": null,
"web_url": "http://example.com/example/example/issues/110",
"confidential": false,
-<<<<<<< HEAD
- "weight": null
-=======
->>>>>>> ce-com/master
+ "weight": null,
"discussion_locked": false
},
"target_url": "https://gitlab.example.com/gitlab-org/gitlab-ci/issues/10",
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 5ceceaac23552f1bf10822dc1a03084168b925bf..2c14730a6118390be3858ce9deab98435dd310e5 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -532,10 +532,7 @@ PUT /projects/:id/merge_requests/:merge_request_iid
| `labels` | string | no | Labels for MR as a comma-separated list |
| `milestone_id` | integer | no | The ID of a milestone |
| `remove_source_branch` | boolean | no | Flag indicating if a merge request should remove the source branch when merging |
-<<<<<<< HEAD
| `squash` | boolean| no | Squash commits into a single commit when merging |
-=======
->>>>>>> ce-com/master
| `discussion_locked` | boolean | no | Flag indicating if the merge request's discussion is locked. If the discussion is locked only project members can add, edit or resolve comments. |
Must include at least one non-required attribute from above.
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index 3d4a111ba26bb95c6468b3e0320c8843835bfc7e..47d36092329eabd4c9dad275e1b9ecacca7ac004 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -49,13 +49,10 @@ module API
optional :due_date, type: String, desc: 'Date string in the format YEAR-MONTH-DAY'
optional :confidential, type: Boolean, desc: 'Boolean parameter if the issue should be confidential'
optional :discussion_locked, type: Boolean, desc: " Boolean parameter indicating if the issue's discussion is locked"
-<<<<<<< HEAD
end
params :issue_params_ee do
optional :weight, type: Integer, values: 0..9, desc: 'The weight of the issue'
-=======
->>>>>>> ce-com/master
end
params :issue_params do
@@ -202,14 +199,9 @@ module API
desc: 'Date time when the issue was updated. Available only for admins and project owners.'
optional :state_event, type: String, values: %w[reopen close], desc: 'State of the issue'
use :issue_params
-<<<<<<< HEAD
at_least_one_of :title, :description, :assignee_ids, :assignee_id, :milestone_id,
:labels, :created_at, :due_date, :confidential, :state_event,
:weight, :discussion_locked
-=======
- at_least_one_of :title, :description, :assignee_ids, :assignee_id, :milestone_id, :discussion_locked,
- :labels, :created_at, :due_date, :confidential, :state_event
->>>>>>> ce-com/master
end
put ':id/issues/:issue_iid' do
issue = user_project.issues.find_by!(iid: params.delete(:issue_iid))