# Conflicts:
#	app/services/members/approve_access_request_service.rb
#	app/services/members/create_service.rb
#	app/services/members/destroy_service.rb
#	app/services/members/update_service.rb
#	app/views/projects/merge_requests/show.html.haml
#	config/webpack.config.js

[ci skip]

Fix webpack.config.js syntax error from trailing comma

Closes #43669

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

Remove snippet bundle webpack entry point

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

removed profile webpack bundle tag

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

Remove sidebar bundle webpack entry point (EE)

See merge request gitlab-org/gitlab-ee!4713

See https://gitlab.com/gitlab-org/gitlab-ce/issues/43669

Merge branch 'ee-43662-can-t-modify-frozen-hash-error-in-development-when-running-a-rake-task' into 'master'

[EE] Fix a "can't modify frozen Hash" error in lib/api/services.rb in development env

See merge request gitlab-org/gitlab-ee!4748

Resolve "Geo WikiSyncService attempts to sync projects that have no Wiki"

Closes #4826

See merge request gitlab-org/gitlab-ee!4677

Remove sidebar bundle webpack entry point

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

Remove explicit audit event log in MembershipActions

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

[EE] Remove explicit audit event log in MembershipActions

See merge request gitlab-org/gitlab-ee!3536

Merge branch '43662-can-t-modify-frozen-hash-error-in-development-when-running-a-rake-task' into 'master'

Resolve "`can't modify frozen Hash` error in development when running a rake task"

Closes #43662

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

CE upstream - 2018-02-27 12:24 UTC

See merge request gitlab-org/gitlab-ee!4744

Signed-off-by: Rémy Coutable <remy@rymai.me>

EE port of "Prevent webpack from rebooting while switching branches"

Closes gitlab-ce#43638

See merge request gitlab-org/gitlab-ee!4741

Prevent webpack from rebooting while switching branches

Closes #43638 and #43418

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Clear "Labels" dropdown search filter after selection

Closes #24774

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

Keep raw link when redacting unauthorized link object references

Closes #40502

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

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Move it to Members::ApproveAccessRequestService.

Also, note that there was a double audit event log for access request
destruction.
Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Signed-off-by: Rémy Coutable <remy@rymai.me>

Move it to Members::ApproveAccessRequestService.

Also, note that there was a double audit event log for access request
destruction.
Signed-off-by: Rémy Coutable <remy@rymai.me>

Fix a performance/memory issue in lib/api/services.rb

Closes #43620

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

[EE] Fix a performance/memory issue in lib/api/services.rb

Closes gitlab-ce#43620

See merge request gitlab-org/gitlab-ee!4731

Simplify filtering of non-human users.

Closes #43304

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