diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-08-29 21:34:29 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-08-29 21:34:29 +0000 |
| commit | 090956259c47d839b136f9391c3f74255764da81 (patch) | |
| tree | 5a8c5fcd9d90f0ae4ca7e8cefe1261d2d31b504f /config | |
| parent | 21b5239a0016796f1e2b60955f47c7daea318208 (diff) | |
| parent | ce07df77cc4d96d06dacc4319e4e42c23afe850e (diff) | |
| download | gitlab-ce-090956259c47d839b136f9391c3f74255764da81.tar.gz | |
Merge branch 'security-enable-image-proxy' into 'master'
Use image proxy to mitigate stealing ip addresses
Closes #2812
See merge request gitlab/gitlabhq!2926
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/asset_proxy_settings.rb | 6 | ||||
| -rw-r--r-- | config/initializers/fill_shards.rb | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/config/initializers/asset_proxy_settings.rb b/config/initializers/asset_proxy_settings.rb new file mode 100644 index 00000000000..92247aba1b8 --- /dev/null +++ b/config/initializers/asset_proxy_settings.rb @@ -0,0 +1,6 @@ +# +# Asset proxy settings +# +ActiveSupport.on_load(:active_record) do + Banzai::Filter::AssetProxyFilter.initialize_settings +end diff --git a/config/initializers/fill_shards.rb b/config/initializers/fill_shards.rb index 18e067c8854..cad662e12f3 100644 --- a/config/initializers/fill_shards.rb +++ b/config/initializers/fill_shards.rb @@ -1,3 +1,5 @@ -if Shard.connected? && !Gitlab::Database.read_only? +# The `table_exists?` check is needed because during our migration rollback testing, +# `Shard.connected?` could be cached and return true even though the table doesn't exist +if Shard.connected? && Shard.table_exists? && !Gitlab::Database.read_only? Shard.populate! end |