Merge branch 'ce-6-8-1' into 'master'

Put 6.8.1 into EE

CHANGELOG

+v 6.8.1
+  - Bump required gitlab-shell version to 1.9.3
+
 v 6.8.0
   - Ability to at mention users that are participating in issue and merge req. discussion
   - Enabled GZip Compression for assets in example Nginx, make sure that Nginx is compiled with --with-http_gzip_static_module flag (this is default in Ubuntu)

VERSION

-<<<<<<< HEAD
-6.8.0.rc1-ee
+6.8.0-ee

config/initializers/1_settings.rb

 class Settings < Settingslogic
-  source "#{Rails.root}/config/gitlab.yml"
+  source ENV.fetch('GITLAB_CONFIG') { "#{Rails.root}/config/gitlab.yml" }
   namespace Rails.env
 
   class << self

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

doc/install/installation.md

@@ -128,7 +128,7 @@ GitLab Shell is an ssh access and repository management software developed speci
     cd /home/git
 
     # Clone gitlab shell
-    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-shell.git -b v1.9.1
+    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-shell.git -b v1.9.3
 
     cd gitlab-shell
 

doc/release/monthly.md

@@ -58,16 +58,32 @@ Check if changed since last release (~22nd of last month depending on when last
 
 * [![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.png?branch=master)](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
 

lib/tasks/gitlab/check.rake

@@ -779,7 +779,7 @@ namespace :gitlab do
   end
 
   def check_gitlab_shell
-    required_version = Gitlab::VersionInfo.new(1, 9, 1)
+    required_version = Gitlab::VersionInfo.new(1, 9, 3)
     current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
 
     print "GitLab Shell version >= #{required_version} ? ... "