Fix typos and denting
This commit is contained in:
parent
3b088fc5b5
commit
d28a587e82
|
@ -329,7 +329,7 @@ Example response:
|
|||
## Delete an issue
|
||||
|
||||
Only for admins and project owners. Soft deletes the issue in question.
|
||||
If the operation is successful, a status code of `200` is returned. Any the case you cannot
|
||||
If the operation is successful, a status code `200` is returned. In case you cannot
|
||||
destroy this issue, or it is not present, code `404` is given.
|
||||
|
||||
```
|
||||
|
|
|
@ -383,10 +383,9 @@ If an error occurs, an error number and a message explaining the reason is retur
|
|||
## Delete a merge request
|
||||
|
||||
Only for admins and project owners. Soft deletes the merge request in question.
|
||||
If the operation is successful, a status code of `200` is returned. Any the case you cannot
|
||||
If the operation is successful, a status code `200` is returned. In case you cannot
|
||||
destroy this merge request, or it is not present, code `404` is given.
|
||||
|
||||
|
||||
```
|
||||
DELETE /projects/:id/merge_requests/:merge_request_id
|
||||
```
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
require('spec_helper')
|
||||
|
||||
describe Projects::IssuesController do
|
||||
let(:project) { create(:project) }
|
||||
let(:project) { create(:project) }
|
||||
let(:user) { create(:user) }
|
||||
let(:issue) { create(:issue, project: project) }
|
||||
|
||||
|
@ -201,7 +201,7 @@ describe Projects::IssuesController do
|
|||
let(:namespace) { create(:namespace, owner: owner) }
|
||||
let(:project) { create(:project, namespace: namespace) }
|
||||
|
||||
before { sign_in owner }
|
||||
before { sign_in(owner) }
|
||||
|
||||
it "deletes the issue" do
|
||||
delete :destroy, namespace_id: project.namespace.path, project_id: project.path, id: issue.iid
|
||||
|
|
|
@ -2,17 +2,17 @@ require "spec_helper"
|
|||
|
||||
describe API::API, api: true do
|
||||
include ApiHelpers
|
||||
let(:base_time) { Time.now }
|
||||
let(:user) { create(:user) }
|
||||
let(:admin) { create(:user, :admin) }
|
||||
let(:base_time) { Time.now }
|
||||
let(:user) { create(:user) }
|
||||
let(:admin) { create(:user, :admin) }
|
||||
let(:non_member) { create(:user) }
|
||||
let!(:project) { create(:project, creator_id: user.id, namespace: user.namespace) }
|
||||
let!(:project) { create(:project, creator_id: user.id, namespace: user.namespace) }
|
||||
let!(:merge_request) { create(:merge_request, :simple, author: user, assignee: user, source_project: project, target_project: project, title: "Test", created_at: base_time) }
|
||||
let!(:merge_request_closed) { create(:merge_request, state: "closed", author: user, assignee: user, source_project: project, target_project: project, title: "Closed test", created_at: base_time + 1.second) }
|
||||
let!(:merge_request_merged) { create(:merge_request, state: "merged", author: user, assignee: user, source_project: project, target_project: project, title: "Merged test", created_at: base_time + 2.seconds) }
|
||||
let!(:note) { create(:note_on_merge_request, author: user, project: project, noteable: merge_request, note: "a comment on a MR") }
|
||||
let!(:note2) { create(:note_on_merge_request, author: user, project: project, noteable: merge_request, note: "another comment on a MR") }
|
||||
let(:milestone) { create(:milestone, title: '1.0.0', project: project) }
|
||||
let!(:note) { create(:note_on_merge_request, author: user, project: project, noteable: merge_request, note: "a comment on a MR") }
|
||||
let!(:note2) { create(:note_on_merge_request, author: user, project: project, noteable: merge_request, note: "another comment on a MR") }
|
||||
let(:milestone) { create(:milestone, title: '1.0.0', project: project) }
|
||||
|
||||
before do
|
||||
project.team << [user, :reporters]
|
||||
|
|
Loading…
Reference in New Issue