diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-09-13 16:23:36 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-09-13 16:23:36 +0000 |
| commit | 6dc341f7f8f99376fb7d2ad53d642a4b3f454fea (patch) | |
| tree | 9cf490f0e2c0097488ce284784319d6c69dd5e42 | |
| parent | d25633f8b0eb22fbe6cdb7fe848d3eb90414c187 (diff) | |
| parent | ab43e9c1f9ad91f9ac2d8e648f747cd0873e4f69 (diff) | |
| download | gitlab-ce-6dc341f7f8f99376fb7d2ad53d642a4b3f454fea.tar.gz | |
Merge branch 'patch-4' into 'master'
Update gitlab shell secret file also when it is empty
Use `File.size?` instead of `File.exist?` so that secret token is
generated when the file is empty.
See merge request !3774
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/gitlab/backend/shell.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 013d1a03824..0714dc4dc33 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,7 @@ v 8.12.0 (unreleased) - Prune events older than 12 months. (ritave) - Prepend blank line to `Closes` message on merge request linked to issue (lukehowell) - Filter tags by name !6121 + - Update gitlab shell secret file also when it is empty. !3774 (glensc) - Give project selection dropdowns responsive width, make non-wrapping. - Make push events have equal vertical spacing. - Add two-factor recovery endpoint to internal API !5510 diff --git a/lib/gitlab/backend/shell.rb b/lib/gitlab/backend/shell.rb index 839a4fa30d5..c412249a01e 100644 --- a/lib/gitlab/backend/shell.rb +++ b/lib/gitlab/backend/shell.rb @@ -195,7 +195,7 @@ module Gitlab # Create (if necessary) and link the secret token file def generate_and_link_secret_token secret_file = Gitlab.config.gitlab_shell.secret_file - unless File.exist? secret_file + unless File.size?(secret_file) # Generate a new token of 16 random hexadecimal characters and store it in secret_file. token = SecureRandom.hex(16) File.write(secret_file, token) |