diff options
author | Stan Hu <stanhu@gmail.com> | 2016-07-27 02:09:11 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-27 13:17:00 +0200 |
commit | c978bed8bfcc23456707c572a779c29a644ce354 (patch) | |
tree | 3df55519bd60a8c8f367a5d035dc4843c6ab891a | |
parent | 461505519645c8b65f73bd8f64e7bac7d7165d0b (diff) | |
download | gitlab-ce-c978bed8bfcc23456707c572a779c29a644ce354.tar.gz |
Merge branch '20124-disable-repository-validation-during-precompile-step' into 'master'
Add ENV variable to skip repository storages validations
Closes #20124
See merge request !5478
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | config/initializers/6_validations.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index e84bb76917a..005076fa6c5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,7 @@ v 8.10.2 (unreleased) - Disable MySQL foreign key checks before dropping all tables. !5472 - Ensure relative paths for video are rewritten as we do for images. !5474 - Ensure current user can retry a build before showing the 'Retry' button. !5476 + - Add ENV variable to skip repository storages validations. !5478 - Don't show comment button in gutter of diffs on MR discussion tab v 8.10.1 diff --git a/config/initializers/6_validations.rb b/config/initializers/6_validations.rb index 37746968675..d92f64e1647 100644 --- a/config/initializers/6_validations.rb +++ b/config/initializers/6_validations.rb @@ -26,4 +26,4 @@ def validate_storages end end -validate_storages unless Rails.env.test? +validate_storages unless Rails.env.test? || ENV['SKIP_STORAGE_VALIDATION'] == 'true' |