delta/gitlab/gitlab-ce.git/spec/models/ci, branch bugfix/upgrade-ruby-parser

Improve specs for pipeline and pipeline seeds

2017-06-05T13:23:09+00:00

Merge branch 'master' into feature/gb/persist-pipeline-stages

2017-06-05T10:51:59+00:00

* 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

Merge branch '31061-26135-ci-project-slug-enviroment-variables' into 'master'

2017-06-05T10:25:35+00:00

Add slugified project path to CI environment variables

Closes #31061

See merge request !11838

Add slugify project path to CI enviroment variables

2017-06-03T07:36:41+00:00

Refine implementation of pipeline stage seeds

2017-06-02T10:16:11+00:00

CreatePipelineBuildsService would have created env

2017-06-02T07:19:34+00:00

So we don't have to do it in CreateDeploymentService
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11695#note_31322649

Merge remote-tracking branch 'upstream/master' into 25680-CI_ENVIRONMENT_URL

2017-06-01T20:24:57+00:00

* upstream/master: (39 commits)
  Resolve "Improve Container Registry description"
  Add username parameter to gravatar URL
  Fix replying to a commit discussion displayed in the context of an MR
  Add fog-aliyun as backup storage provider
  Add missing specs
  Make sure protected can't be null; Test protected!
  Update session cookie key name to be unique to instance in development
  Just mention which GitLab version is required
  Fix data inconsistency issue for old artifacts by moving them to a currently used path
  Fix N+1 queries for non-members in comment threads
  Fix rubocop in spec/helpers/diff_helper_spec.rb
  Merge two items into one in the doc
  Only remove FK if it exists
  Maintain notes avatar at smaller breakpoint
  Fix pipeline schedule value name in documentation
  Add test for Project#protected_for?
  Update diff discussion position per discussion instead of per note
  Display Shared Runner status in Admin Dashboard
  Make sure we're loading the fresh variables
  Now secret_variables_for would return the variables
  ...

Fix a typo: not -> no

2017-06-01T15:00:08+00:00

Merge all environment url methods, introduce ensure_persisted_environment

2017-06-01T14:52:01+00:00

To make sure that we're accessing the same instance, so ending up
with `env.external` = `env.external_url` shall be fine.

Make sure protected can't be null; Test protected!

2017-06-01T13:48:31+00:00