diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2017-05-17 13:28:10 +0300 |
|---|---|---|
| committer | Andrew Newdigate <andrew@gitlab.com> | 2017-05-17 13:28:10 +0300 |
| commit | d4ccfbb4decafaf9d81a90b18815091a40fafda7 (patch) | |
| tree | b6fafdd7ea0e4326e4af07922ee8fa4243e49903 | |
| parent | 138ec083234709c32ba35a636d6e1ea340bec11f (diff) | |
| parent | f46ce4679de42ccdb0fed010d6ae4fdfebfe6f90 (diff) | |
Merge branch 'com-org' into 'master'
dev.gitlab.com -> dev.gitlab.org
See merge request !158
| -rw-r--r-- | .gitlab/issue_templates/Migration_Acceptance_Testing.md | 2 | ||||
| -rw-r--r-- | doc/MIGRATION_PROCESS.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/issue_templates/Migration_Acceptance_Testing.md b/.gitlab/issue_templates/Migration_Acceptance_Testing.md index 4abc78a9a..4709bf8b2 100644 --- a/.gitlab/issue_templates/Migration_Acceptance_Testing.md +++ b/.gitlab/issue_templates/Migration_Acceptance_Testing.md @@ -10,7 +10,7 @@ Feature Toggle Environment Variable: `XXXXXXXXXXXXXXX` - [ ] [Chef recipes](https://dev.gitlab.org/cookbooks/chef-repo) to enable/disable this feature (link to MR) - [ ] [Grafana dashboard](https://gitlab.com/gitlab-org/gitaly-dashboards) for monitoring (link to MR) - [ ] Environments - - [ ] `dev.gitlab.com` + - [ ] `dev.gitlab.org` - [ ] Staging - [ ] `gitlab.com` - [ ] Test Results (post as comments on this issue) diff --git a/doc/MIGRATION_PROCESS.md b/doc/MIGRATION_PROCESS.md index ce339cef8..d1789951f 100644 --- a/doc/MIGRATION_PROCESS.md +++ b/doc/MIGRATION_PROCESS.md @@ -117,7 +117,7 @@ As the maintainer of Gitaly, Jacob to review: * The alerts are in-place * The runbooks are good -Once Jacob has approved, the feature flag will be enabled on dev.gitlab.com, staging and GitLab.com, but the feature flag will be disabled by default. On-premise installations can enable the feature if they wish, but it will be disabled by default. +Once Jacob has approved, the feature flag will be enabled on dev.gitlab.org, staging and GitLab.com, but the feature flag will be disabled by default. On-premise installations can enable the feature if they wish, but it will be disabled by default. For a feature toggle `GITALY_EXAMPLE_FEATURE`, the toggle would be enabled by setting the environment variable: |