* master: (21 commits)
  Fix issues with pdf-js dependencies
  fix missing changelog entries for security release on 2017-01-23
  Update top bar issues icon
  Fix order of CI lint ace editor loading
  Fix spec
  Fix spec
  Fix spec
  Add changelog
  fix
  Add a spec for concurrent process
  Add changelog
  essential
  add CHANGELOG.md for !13208
  adjust user contribution calendar time formatting
  fix rubocop violations 👮
  fix mysql syntax for date INTERVAL arithmatic
  add tests for proper timezone date grouping within ContributionsCalendar
  adjust timezone for date grouping in contributions calendar
  use timezone-aware Date.current instead of Date.today in ContributionsCalendar class
  display system timezone underneath activity calendar
  ...

Fix issues with pdf-js dependencies

See merge request !13328

Fix order of CI lint ace editor loading

Closes #35985

See merge request !13316

Fix Timezone Inconsistencies in User Contribution Calendar

Closes #27616 and #1943

See merge request !13208

Add missing CHANGELOG.md entries for security release on 2017-01-23

See merge request !13327

Fix "Cannot connect to CI server error messages"

Closes #34547

See merge request !13252

Fix "pipeline_schedules pages throwing error 500" when "Active Ci::PipelineSchedule have a nullified `next_run_at`"

Closes #32790

See merge request !13286

Update top bar issues icon

Closes #35275

See merge request !13263

* master:
  Fix pipeline icon in contextual nav for projects
  fixed up specs
  trying to fix tests
  fix merge conflicts
  css fixes
  try and fix some tests
  34060 Simply general project settings to use expanded panels

Fix pipeline icon in contextual nav for projects

See merge request !13324

34060 Simply general project settings to use expanded panels

Closes #34060

See merge request !12620

* master: (162 commits)
  Since mysql is not a priority anymore, test it less
  Add container registry and spam logs icons
  Fix different Markdown styles
  Backport to CE for:
  Make new dropdown dividers full width
  Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs
  Install yarn via apt in update guides
  Use long curl options
  Remove monkey-patched Array.prototype.first() and last() methods
  Openshift Getting Started
  35659 Rename Pipelines tab to CI / CD in new navigation
  Don't bother going through an entire Banzai pipeline for empty text
  Add active state for pipelines settings on old nav
  Bump rspec to 3.6.0
  Resolve "Specific Async Script Loading by using a Page Variable"
  Revert "Merge branch 'rs-warm-capybara-only-in-ci' into 'master'"
  another rubocop style fix
  Use mixin for new dropdown style
  Migrate Repository#last_commit_for_path to Gitaly
  Migrate blame loading to Gitaly
  ...

Since mysql is not a priority anymore, test it less

See merge request !13320

Install 'yarn' globally to avoid PATH issues

See merge request !13273

Make dividers of new dropdown style full width

Closes #35784

See merge request !13276

Add container registry and spam logs icons

Closes #35944

See merge request !13317

Add spec to test combining API merge_requests query parameters

See merge request !11172

CE: Move EE-specific files to a standalone directory

Closes gitlab-ee#3097

See merge request !13311

Revert "Merge branch 'rs-warm-capybara-only-in-ci' into 'master'"

See merge request !13292

Migrate Repository#last_commit_for_path to Gitaly

Closes gitaly#433

See merge request !13200

Migrate blame loading to Gitaly

Closes gitaly#421

See merge request !13155

Closes #35985

Add active state for pipelines settings on old nav

Closes #35948

See merge request !13297

35659 Rename Pipelines tab to CI / CD in new navigation

Closes #35659

See merge request !13241

Move OpenShift blog from WWW to CE

See merge request !13301

https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2483