Merge remote-tracking branch 'upstream/master' into qa-deploy-key-scenario

2018-01-24T15:13:56+00:00

* upstream/master: (106 commits)
  Remove callback as we already update accordingly on services
  added missing imports
  correctly imports performance bar
  Added imports for dispatcher routes
  Make the exposing of the Application secret more explicit
  Add documentation about when the application API was added
  Add application create API
  Return a blank JSON response for a missing .js file to prevent Rails CSRF errors
  add CHANGELOG.md entry for !15804
  disable CopyAsGFM on iOS due to bug in webkit
  Update changelog
  GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side
  Return more consistent values for merge_status on MR API
  Fix a migration spec messing up the MergeRequestDiff DB schema
  Backport changes to Gitlab::Checks::ChangeAccess from EE
  remove webpack bundle tag for monitoring:environments:metrics
  Set timezone for karma to UTC
  Upgrade jasmine + raven to newer versions
  Ensure Gitaly Ruby gems are installed using the correct Gemfile and at the correct location
  Clarify that a feature that isn't in review by the 1st or 3rd doesn't necessarily miss the freeze
  ...

Add ability to drive the API in QA specs

2018-01-23T10:23:23+00:00

Generate ssh key on the fly for QA

2018-01-22T07:41:52+00:00

Update GitLab QA dependencies

2017-12-14T10:00:14+00:00

Update QA Nokogiri to 1.8.1

2017-10-05T09:54:05+00:00

Resolves three security advisories from bundle-audit

Add byebug to GitLab QA gem list for debugging

2017-10-04T05:42:49+00:00

Use headless chrome instead of webkit via QtWebkit

2017-05-25T07:36:39+00:00

Speed up GitLab QA docker image builds

2017-03-16T13:04:43+00:00

delta/gitlab/gitlab-ce.git/qa/Gemfile.lock, branch 44296-commit-path