delta/gitlab/gitlab-ce.git/spec/controllers, branch convdev-docs

Correct RSpec/SingleLineHook cop offenses

2017-06-14T18:18:56+00:00

Merge remote-tracking branch 'upstream/master' into 33149-rename-more-builds

2017-06-14T08:23:41+00:00

* upstream/master: (34 commits)
  Revert "Merge branch 'karma-headless-chrome' into 'master'"
  Make small pipeline schedules UI enhancements.
  Remove js classes from vue component that are not needed in vue component
  Update tests and application
  Adds "Pipeline" to job's sidebar
  Change border color of job's scroll controllers to $border-color
  Add database helpers 'add_timestamps_with_timezone' and 'timestamps_with_timezone'
  Added Tectonic to the page.
  Always check read_issue permissions when loading issue
  Handle legacy jobs without name
  Do not expose internal artifacts hash in build entity
  Use wait_for_requests instead of sleep 0.3
  Limit wiki container width
  Fix migrations testing support RSpec hooks order
  Rename BuildEntity to JobEntity
  Fix support for external_url for commit statuses
  Allow to access pipelines even if they are disabled, but only present jobs and commit statuses without giving ability to access them
  add CHANGELOG.md entry for !12036
  remove phantomjs-specific test hacks
  update karma job to use chrome build image created by gitlab-build-images!41
  ...

Update tests and application

2017-06-13T14:05:38+00:00

Merge remote-tracking branch 'upstream/master' into 33149-rename-more-builds

2017-06-13T10:01:25+00:00

* upstream/master: (460 commits)
  Center dropdown for pipeline's  mini graph
  Documentation bugfix of invalid JSON payload example of Create a commit with multiple files and actions
  Fix filename method of GitlabUploader to return always real filename
  Ignore CVE-2017-5029 in Nokogiri
  Refactor atom builder by using xml.atom layout
  Let PhantomJS load local images
  Add a changelog entry
  Only add a description change note when no tasks are updated
  Doc: Add the need to upgrade to Go 1.8.3 in the 9.1->9.2 documentation as the upgrade fails with Go 1.5 (installed with Gitlab 8.1)
  Use gitaly 0.11.2
  Add the ability to perform background migrations
  Always render warnings icon in orange
  Fix a few translation for zh_TW
  Improve Job detail view to make it refreshed in real-time instead of reloading
  Attempts to run RSpec tests twice (1 retry)
  ignore name validation on importing
  Only show hover state on links and buttons
  Use vue files for navigation tabs and buttons
  doc: add example of scheduler when
  Add test for u2f helper and changelog entry
  ...

Merge branch 'use-request-store-helper-instead-actual-code' into 'master'

2017-06-12T14:58:24+00:00

Use :request_store hooks on specs

See merge request !12058

Make sure reCAPTCHA configuration is loaded when spam checks are initiated

2017-06-10T10:43:02+00:00

Previously it was possible when an issue was updated and Akismet flagged it as spam
that the reCAPTCHA configuration was not loaded.

Closes #33532

Use :request_store hooks on specs

2017-06-09T21:18:36+00:00

Revert 'New file from interface on existing branch'

2017-06-09T15:10:47+00:00

Merge branch 'dashboard-milestone-tabs-loading-async' into 'master'

2017-06-09T11:25:26+00:00

Fixed dashboard milestone tabs not loading

Closes #33477

See merge request !12023

Fixed dashboard milestone tabs not loading

2017-06-09T08:57:42+00:00

Closes #33477