gitlab-org--gitlab-foss/spec/factories/ci
Grzegorz Bizon 79380fe5fb Merge branch 'master' into feature/gb/persist-pipeline-stages
* master: (524 commits)
  Improve user experience around slash commands in instant comments
  Fix LFS timeouts when trying to save large files
  retryable? is now available for CommitStatus
  Resolve "Documentation of `.gitlab-ci.yml` states incorrect example for variables"
  Fix test failures
  Add slugify project path to CI enviroment variables
  Fixed typo: craeted -> created
  32118 Make New environment empty state btn lowercase
  Expose import_status in Projects API
  32832 Remove overflow from comment form for confidential issues and vertically aligns confidential issue icon
  Fix test failures
  Allow manual bypass of auto_sign_in_with_provider
  Fix keys seed
  Allow users to be hard-deleted from the API
  fixup some classnames and media queries
  Enable the Style/PreferredHashMethods cop
  Lint our factories creation in addition to their build
  Don’t schedule workers from inside transactions
  Allow scheduling from after_commit hooks
  Forbid Sidekiq scheduling in transactions
  ...

Conflicts:
	app/serializers/pipeline_entity.rb
	db/schema.rb
	spec/factories/ci/stages.rb
	spec/lib/gitlab/import_export/safe_model_attributes.yml
	spec/services/ci/create_pipeline_service_spec.rb
	spec/spec_helper.rb
2017-06-05 12:51:59 +02:00
..
builds.rb Just use the url from options, not saving it as a column 2017-06-01 18:29:11 +08:00
pipeline_schedule.rb Add Pipeline Schedules that supersedes experimental Trigger Schedule 2017-05-07 22:35:56 +00:00
pipelines.rb Merge branch '33139-lint-our-factories' into 'master' 2017-06-02 18:49:18 +00:00
runner_projects.rb All CI offline migrations 2017-03-17 23:06:11 +00:00
runners.rb Don't use FFaker in factories, use sequences instead 2017-04-03 18:54:48 +02:00
stages.rb Merge branch 'master' into feature/gb/persist-pipeline-stages 2017-06-05 12:51:59 +02:00
trigger_requests.rb Lint our factories creation in addition to their build 2017-06-02 19:06:50 +02:00
triggers.rb Merge remote-tracking branch 'origin/master' into optimise-pipelines 2017-04-06 22:05:22 +02:00
variables.rb Add tests and also pass protected vars to protected tags 2017-05-25 18:05:27 +08:00