delta/gitlab/gitlab-ce.git/spec/features/projects, branch git-write-ref-prep

Merge branch '39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled' into 'master'

2018-01-07T18:56:09+00:00

Resolve "Redirect to GCP page if users try to create a cluster but the account is not enabled"

Closes #39957 and #41410

See merge request gitlab-org/gitlab-ce!15665

Merge branch 'fix/gb/fix-import-export-restoring-associations' into 'master'

2018-01-07T16:02:40+00:00

Fix restoring associations with import/export

Closes #41646

See merge request gitlab-org/gitlab-ce!16221

Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled

2018-01-06T18:58:27+00:00

Store OAuth token in Redis for worker to pick up

2018-01-06T18:41:49+00:00

Merge branch '22643-manual-job-page' into 'master'

2018-01-06T14:40:45+00:00

Resolve "Improve non-triggered manual action job detail page"

Closes #22643 and #37843

See merge request gitlab-org/gitlab-ce!15991

Bump import/export version in test project export

2018-01-06T08:27:25+00:00

Merge branch 'master' into 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled

2018-01-05T19:04:33+00:00

Merge branch 'master' into 41249-clearing-the-cache

2018-01-05T17:21:45+00:00

Merge branch 'refactor-cluster-show-page-conservative' into 'master'

2018-01-05T12:22:38+00:00

Refactor cluster show page

Closes #41335

See merge request gitlab-org/gitlab-ce!16089

Merge branch 'master' into 22643-manual-job-page

2018-01-05T11:37:06+00:00

* master: (24 commits)
  Allow local tests to use a modified Gitaly
  Update check.md
  add deprecation and removal issue to docs
  Add status attribute to runner api entity
  Fix typos in a code comment
  Just try to detect and assign once
  Modify `LDAP::Person` to return username value based on attributes
  Create Kubernetes based on Application Templates
  Fix a bug where charlock_holmes was used needlessly to encode strings
  Ignore the Migration/Datetime cop in a migration that fix a column type to datetime_with_timezone
  Use `__` instead of `s__` when context is not required
  Enclose props in quotes
  Update some Gitaly annotations in Gitlab::Shell
  Prepare Gitlab::Git::Repository#rebase for Gitaly migration
  add missing changelog
  refactor spec, add docs
  deprecate check integrity task
  add lock specs
  add locks chek
  remove max-depth flag so it works with subgroups
  ...