# Conflicts:
#	.gitlab-ci.yml
#	app/assets/javascripts/boards/services/board_service.js
#	app/helpers/services_helper.rb

[ci skip]

Changed IDE sidebar min width

Closes #44836

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

Merge security fixes to master

See merge request gitlab/gitlabhq!2369

Export and import LFS objects

Closes #40643

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

Move ListCommitsByOid to OPT_OUT

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

CE upstream - 2018-04-05 05:20 UTC

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

This makes accessing LFS Objects for a project easier

  project.lfs_storage_project.lfs_objects`

becomes

  project.all_lfs_objects

This will make the refactor in
https://gitlab.com/gitlab-org/gitlab-ce/issues/39769 easier to deal
with.

Downloading the stream directly to the archive. In order to avoid
conflicts with the cache.

If the LFS object already exist, we'll link it tot he existing one, if
not we'll create it.

The LFS files will be included in the `lfs-objects` directory in the archive.

Fix 404 in group boards when moving issue between lists

Closes #44551

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

EE-PORT Fix 404 in group boards when moving issue between lists

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

Update issue_board.md to fix one occurrence of the Gitlab edition for multiple issue board feature

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

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

[Rails5] Add rails5 jobs to gitlab-ci.yml

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

[Rails5] Add rails5  jobs to gitlab-ci.yml

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

[10.6] Prevent notes on confidential issues from being sent to chat

See merge request gitlab/gitlabhq!2366
# Conflicts:
#	app/helpers/services_helper.rb

Port of "Fix XSS on commit diff view" for 10-6

See merge request gitlab/gitlabhq!2364

Escape miletone attribute when appending to the DOM

See merge request gitlab/gitlabhq!2359

# Conflicts:
#	locale/gitlab.pot

[ci skip]

CE upstream - 2018-04-04 18:26 UTC

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

Fix typo in application settings page

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

[EE] Fix typo in application settings page

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

Resolve "ActiveRecord::RecordNotUnique: PG::UniqueViolation: ERROR:  duplicate key value violates unique constraint "index_ci_builds_meta..."

Closes #44922

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

# Conflicts:
#	app/assets/javascripts/pages/groups/issues/index.js
#	app/views/admin/application_settings/show.html.haml
#	doc/user/project/labels.md

[ci skip]

Resolve "NoMethodError: undefined method `log_info' for Geo::RepositorySyncWorker"

Closes #5555

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

Fix links to subdirectories of a directory with a plus character in its path

Closes #44967

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

Bulk deleting refs is handled by Gitaly by default

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

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

Allow an alternate incoming email address for GitLab.com

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

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