diff options
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 2 | ||||
| -rw-r--r-- | config/initializers/secret_token.rb | 4 | ||||
| -rw-r--r-- | doc/release/monthly.md | 30 |
4 files changed, 28 insertions, 10 deletions
@@ -1 +1 @@ -6.8.0.rc1 +6.8.0 diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 59564d9ea33..4e8b3f304d0 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -1,5 +1,5 @@ class Settings < Settingslogic - source "#{Rails.root}/config/gitlab.yml" + source ENV.fetch('GITLAB_CONFIG') { "#{Rails.root}/config/gitlab.yml" } namespace Rails.env class << self diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index 98400290113..62a54bc8c63 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -9,7 +9,9 @@ require 'securerandom' def find_secure_token token_file = Rails.root.join('.secret') - if File.exist? token_file + if ENV.key?('SECRET_KEY_BASE') + ENV['SECRET_KEY_BASE'] + elsif File.exist? token_file # Use the existing token. File.read(token_file).chomp else diff --git a/doc/release/monthly.md b/doc/release/monthly.md index 9dbe62f1210..284e4e16595 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -58,16 +58,32 @@ Check if changed since last release (~22nd of last month depending on when last * [](https://coveralls.io/r/gitlabhq/gitlabhq) -## Make a release branch +## Release Schedule After making the release branch new commits are cherry-picked from master. When the release gets closer we get more selective what is cherry-picked. The days of the month are approximately as follows: -* 1-7th: official merge window (see contributing guide) -* 8-14th: work on bugfixes, sponsored features and GitLab EE -* 15th: code freeze (stop merging into master except essential bugfixes) -* 18th: release candidate 1 (VERSION x.x.0.rc1, annotated tag and tweet about x.x.0.rc1, release on GitLab Cloud) -* 20st: optional release candidate 2 (x.x.0.rc2, only if rc1 had problems) -* 22nd: release (VERSION x.x.0, create x-x-stable branch, annotated tag tag, blog and tweet) +* 1-7th: Official merge window (see contributing guide). +* 8-14th: Work on bugfixes, sponsored features and GitLab EE. +* 15th: Code freeze + - Stop merging into master, except essential bugfixes + - Select a Release Manager +* 18th: Release Candidate 1 + - Set VERSION to x.x.0.rc1 + - Create annotated tag x.x.0.rc1 + - Push the changes to GitLab.com, dev.gitlab.com, GitHub + - Tweet about the release + - Create a new branch on cloud for rc1 + - Deploy the new branch on Cloud after tests pass +* 20st: Optional release candidate 2 (x.x.0.rc2, only if rc1 had problems) +* 22nd: Release + - Create x-x-stable branch and push to the repositories + - QA + - Fix anything coming out of the QA + - Set VERSION to x.x.0 + - Create annotated tag x.x.0 + - Push VERSION + Tag to master, merge into x-x-stable + - Publish blog for new release + - Tweet to blog (see below) * 23nd: optional patch releases (x.x.1, x.x.2, etc., only if there are serious problems) * 24-end of month: release GitLab EE and GitLab CI |