delta/gitlab/gitlab-ce.git, branch 10-4-stable-patch-2-conflicts

Merge branch 'dm-project-system-hooks-in-transaction' into 'master'

2018-01-29T18:19:52+00:00

Execute system hooks after-commit when executing project hooks

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

Merge branch 'fix-local-rspec-tests' into 'master'

2018-01-29T18:13:10+00:00

Fix local RSpec tests due to bug in `webpack_bundle_tag`

Closes #42368

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

Merge branch '42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-error' into 'master'

2018-01-29T18:12:06+00:00

Resolve "Import from GitLab.com fails (destination already exists and is not an empty directory error)."

Closes #42327

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

Merge branch '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit' into 'master'

2018-01-29T18:02:46+00:00

Resolve "Gitaly::CommitService: Encoding::UndefinedConversionError: U+C124 from UTF-8 to ASCII-8BIT"

Closes #42161

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

Merge branch 'fix-postgresql-table-grant' into 'master'

2018-01-29T18:01:40+00:00

Use has_table_privilege for TRIGGER on PostgreSQL

Closes #38634

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

Merge branch 'fj-42112-fix-deploy-keys-migration-mysql' into 'master'

2018-01-29T18:00:58+00:00

Fix bug in security release with deploy keys migration

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

Merge branch '32546-cannot-copy-paste-on-ios' into 'master'

2018-01-29T17:58:08+00:00

Resolve "Cannot copy/paste on iOS"

Closes #32546

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

Merge branch 'fix-cache-clear-windows' into 'master'

2018-01-29T17:55:03+00:00

Fix cache clear windows

Closes #42487

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

Update VERSION to 10.4.1

2018-01-25T04:02:25+00:00

Update CHANGELOG.md for 10.4.1

2018-01-25T04:02:16+00:00

[ci skip]