delta/gitlab/gitlab-ce.git, branch winh-prepend-entity

Prepend entity descendant where necessary

2019-08-27T09:05:56+00:00

(cherry picked from commit b87526e8c47b7a3938ab12842bbac99a17fcb750)

Disable InjectEnterpriseEditionModule for lib/api/entities.rb

2019-08-27T09:05:56+00:00

(cherry picked from commit a9454734d851ecc6d9e4a86cd667a33a492fdef9)

Replace prepend_entity with prepend_if_ee

2019-08-27T09:05:54+00:00

(cherry picked from commit 897a9d308db46b620b738b98f2b0e5630ac7d2dd)

Merge branch 'pl-danger-map-rubocop' into 'master'

2019-08-26T11:00:11+00:00

Danger: Map .rubocop{,_todo}.yml to ~backend

See merge request gitlab-org/gitlab-ce!32156

Danger: Map .rubocop{,_todo}.yml to ~backend

2019-08-26T11:00:09+00:00

Merge branch '66443-unrecoverable-configuration-loop-in-external-auth-control' into 'master'

2019-08-26T10:22:34+00:00

Resolve "Unrecoverable configuration loop in external auth control"

Closes #66443

See merge request gitlab-org/gitlab-ce!32102

Merge branch '21505-quickactions-update-pd' into 'master'

2019-08-26T09:20:01+00:00

Apply quickactions when modifying comments

See merge request gitlab-org/gitlab-ce!31136

Add edit_note and spec for editing quick actions

2019-08-26T09:20:00+00:00

Call QuickActionsService on Note update

Add support for notes which just contain
commands after editing

Return http status gone (410) if note was deleted

Temporary frontend addition so it is not
failing when a note is deleted

Move specs to shared examples

Fix rubocop style issue

Deleting note on frontend when status is 410

Use guard clause for note which got deleted

Simplified condition for nil note

This method should no longer be called
with nil note

Refactoring of execute method to reduce
complexity

Move errors update to delete_note method

Note is now deleted visually when it only
contains commands after update

Add expectation

Fix style issues

Changing action to fix tests

Add tests for removeNote and update
deleteNote expectations

Merge branch 'da/ignore-tests-in-security-reports' into 'master'

2019-08-26T09:14:16+00:00

Dont run SAST on tests

See merge request gitlab-org/gitlab-ce!32011

Dont run SAST on tests

2019-08-26T09:14:15+00:00