summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-07-27 02:09:11 +0000
committerStan Hu <stanhu@gmail.com>2016-07-27 02:09:11 +0000
commit680d361c83fcf57de2927161ddfe7c09766ae75b (patch)
tree5dcab9b197b2829f7d9f77bf7a1fa9db6183705e
parent02d947f1111849686c35c3bcf0bffb9abd0f8cf5 (diff)
parent2b7e6e99ed78b525eaa7f9e034b9bcf1e4fc5746 (diff)
downloadgitlab-ce-680d361c83fcf57de2927161ddfe7c09766ae75b.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
-rw-r--r--CHANGELOG1
-rw-r--r--config/initializers/6_validations.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5ff0cb42ccc..cf75bee4348 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,7 @@ v 8.11.0 (unreleased)
v 8.10.2 (unreleased)
- User can now search branches by name. !5144
+ - Add ENV variable to skip repository storages validations
- Fix backup restore. !5459
- Rescue Rugged::OSError (lock exists) when creating references. !5497
- Disable MySQL foreign key checks before dropping all tables. !5472
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'