gitlab-org--gitlab-foss/lib/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
..
api Enable the Style/PreferredHashMethods cop 2017-06-02 19:11:26 +02:00
assets
ansi2html.rb Enable the Style/TrailingCommaInLiteral cop 2017-05-10 18:25:45 +02:00
charts.rb Revert "Prefer leading style for Style/DotPosition" 2017-02-23 09:33:05 -06:00
gitlab_ci_yaml_processor.rb Refine implementation of pipeline stage seeds 2017-06-02 12:16:11 +02:00
mask_secret.rb Improve JwtController implementation 2016-09-20 19:15:13 +02:00
model.rb