* 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
  ...

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

CE upstream - 2018-03-16 15:27 UTC

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

Add a Go back option to Web IDE

Closes #4592

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

Choose shortest match for CE branch in ee-files-location-check.

Closes #5271

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

Bump fog-google to 1.3.3

Closes #5249

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

IDE open changed files in diff viewer

Closes #4568

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

# Conflicts:
#	doc/ci/examples/code_climate.md
#	lib/gitlab/database.rb
#	spec/lib/gitlab/database_spec.rb

[ci skip]

Create commit API and Web IDE obey LFS filters

Closes #42287

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

Docs: refactor doc general guidelines and style guidelines

Closes #41281

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

Docs: refactor doc general guidelines and style guidelines

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

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

Resolve "Geo docs: Second SSH restart only considers ‘ssh’ not ‘sshd’"

Closes #5263

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

Update Code Quality example documentation

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

Update Code Quality example documentation

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

CE upstream - 2018-03-16 12:24 UTC

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

Fix CE install link for downgrade docs

Closes #44273

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

Add version available info to integrity check rake task docs

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

Resolve "Isolate elasticsearch-using specs"

Closes #4986

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

Update flipper 0.11.0 -> 0.13.0

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

Update knapsack to 1.16.0

Closes #44235

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

Resolve "Technical debt: `Service#disabled_title` no longer used and is left dangling in `services/_form.html.haml`"

Closes #43522

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

Cache table_exists?('application_settings') to reduce repeated schema reloads

Closes #43355

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

Cache column_exists? for application settings

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

Cache column_exists? for Elasticsearch columns

Closes gitlab-ce#43355

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

# Conflicts:
#	doc/ci/examples/README.md
#	doc/ci/examples/sast_docker.md
#	doc/topics/autodevops/index.md

[ci skip]

changed selection background color