# Conflicts:
#	app/models/issue.rb
#	app/services/projects/destroy_service.rb
#	db/schema.rb

[ci skip]

Fix "Can't modify frozen hash" error when project is destroyed

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

Update doorkeeper-openid_connect and doorkeeper

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

Remove oj as we're not using it

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

Fix audit and Geo project deletion events not being logged in certain conditions

Closes gitlab-ce#44378

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

Merge branch '43928-merge-request-comment-gets-cleared-once-the-previous-comment-is-submitted' into 'master'

Resolve "Notes karma specs failing"

Closes #44002

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

Relax omniauth-saml 1.0.0 -> 1.10

Closes #14292

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

Add documentation for security report on the pipeline page

Closes #5247

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

Atomic generation of internal ids for issues.

Closes #31114

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

EE-port of: Atomic generation of internal ids for issues.

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

CE upstream - 2018-03-19 12:27 UTC

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

Added Video explaining Cloud native GitLab Chart

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

Merge branch '44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binary' into 'master'

Resolve "Viewing a particular commit gives 500 error ~ Error (undefined method `binary?')"

Closes #44257

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

Add head+base report for sast container and dast

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

Resolve "GitLab Community Edition 10.5.3 shows plural for 1 item"

Closes #44022

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

Updates svg dependency

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

Add documentation for external authorization

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

CE upstream - 2018-03-19 09:25 UTC

Closes gitlab-runner#3095

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

* master: (54 commits)
  Add Go Back link to WebIDE
  Resolve conflicts
  Docs: refactor doc general guidelines and style guidelines
  Docs: refactor doc general guidelines and style guidelines
  fixed specs & eslint
  Add version available info to integrity check rake task docs
  Extract constant for LfsPointerFile::VERSION_LINE
  dont log any errors with event listeners in tests
  Resolve CE to EE merge conflicts on documentation
  added default editor options
  Bump fog-google to 1.3.3 to fix LFS upload
  removed shadow on modified edior changed selection background color
  improve styling of diff viewer
  fixed karma spec
  fixed scss-lint added pointer cursor to diff overview
  change editor when opening file from sidebar
  fixed SCSS-lint
  added border to overview hide viewport display
  change background of diff overview fix content not resetting when discarded
  remove hacky margin added to hide diff overview added comment re. try/catch in dispose
  ...

Make issue boards height calculation clearer and remove magic numbers

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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Rename `package-qa` in docs

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

In gitlab-org/gitlab-ce!17807 the `package-qa` job was renamed to
`package-and-qa`. But it was not renamed in the docs. So this change
fixes that.

Update CI services documnetation

Closes gitlab-runner#3095

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

CE upstream - 2018-03-19 06:23 UTC

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