gitlab-org--gitlab-foss/spec/services/ci
Grzegorz Bizon 07539ab2b0 Merge branch 'master' into pipeline-blocking-actions
* master: (26 commits)
  Fix UserBasic
  Rename `/take` to `/take_ownership`, expose `owner` in `v3`.
  Update after review
  Fix values being called at Array instead of Hash
  Fix json response in branches controller
  Improve docs and specs related to pages artifacts
  Add MR fo changelog about removing pages artifacts
  Delete artifacts for pages unless expiry date is specified
  Lint doc
  Improved team selection
  Move foreign key to separate migration
  Fix import model attributes
  Update documentation and expose ID
  Introduce tests for pipeline triggers
  Fix trigger model
  Update db/schema
  Make triggers to be user aware
  Make Pipeline Triggers to be user aware
  Update triggers API
  Remove remnants of git annex
  ...

Conflicts:
	db/schema.rb
2017-03-06 15:11:28 +01:00
..
create_pipeline_service_spec.rb updated ci skip regex to accept underscores and hyphens 2017-02-22 11:29:18 +00:00
create_trigger_request_service_spec.rb Make triggers to be user aware 2017-03-05 18:53:00 +01:00
process_pipeline_service_spec.rb Add specs for new pipeline and build action events 2017-03-06 13:01:10 +01:00
register_build_service_spec.rb Fix concurrent access on builds/register 2017-03-01 00:07:56 -08:00
retry_build_service_spec.rb Move unused consts from retry build service to specs 2017-03-02 18:11:12 +01:00
retry_pipeline_service_spec.rb Extend pipeline retry specs with blocking actions 2017-03-06 13:40:50 +01:00
stop_environments_service_spec.rb Revert "Enable Style/DotPosition" 2017-02-23 09:33:19 -06:00
update_build_queue_service_spec.rb Revert "Enable Style/DotPosition" 2017-02-23 09:33:19 -06:00
update_runner_service_spec.rb