Update upstream source from tag 'upstream/11.8.3'

Update to upstream version '11.8.3'
with Debian dir bfb9466dc2
This commit is contained in:
Sruthi Chandran 2019-03-21 23:57:42 +05:30
commit cdee8d5140
4 changed files with 40 additions and 2 deletions

View file

@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
## 11.8.3 (2019-03-19)
### Security (1 change)
- Remove project serialization in quick actions response.
## 11.8.2 (2019-03-13)
### Security (1 change)

View file

@ -1 +1 @@
11.8.2
11.8.3

View file

@ -54,7 +54,7 @@ module NotesActions
respond_to do |format|
format.json do
json = {
commands_changes: @note.commands_changes
commands_changes: @note.commands_changes&.slice(:emoji_award, :time_estimate, :spend_time)
}
if @note.persisted? && return_discussion?

View file

@ -397,6 +397,37 @@ describe Projects::NotesController do
end
end
end
context 'when creating a note with quick actions' do
context 'with commands that return changes' do
let(:note_text) { "/award :thumbsup:\n/estimate 1d\n/spend 3h" }
it 'includes changes in commands_changes ' do
post :create, params: request_params.merge(note: { note: note_text }, format: :json)
expect(response).to have_gitlab_http_status(200)
expect(json_response['commands_changes']).to include('emoji_award', 'time_estimate', 'spend_time')
expect(json_response['commands_changes']).not_to include('target_project', 'title')
end
end
context 'with commands that do not return changes' do
let(:issue) { create(:issue, project: project) }
let(:other_project) { create(:project) }
let(:note_text) { "/move #{other_project.full_path}\n/title AAA" }
before do
other_project.add_developer(user)
end
it 'does not include changes in commands_changes' do
post :create, params: request_params.merge(note: { note: note_text }, target_type: 'issue', target_id: issue.id, format: :json)
expect(response).to have_gitlab_http_status(200)
expect(json_response['commands_changes']).not_to include('target_project', 'title')
end
end
end
end
describe 'PUT update' do