diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-06 21:06:55 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-06 21:06:55 +0000 |
| commit | 915306ec50c50b3b1b0793150a7cb4f31fbbee75 (patch) | |
| tree | c9f6a045ee02003ca9b715783692cb1d623f619d /config/initializers/fog_google_https_private_urls.rb | |
| parent | c353773787407158b6319b6944dee57a6e3522b9 (diff) | |
| parent | 7aa6766cd15036dcfb5391b3fd7bffb9069ffbcf (diff) | |
| download | gitlab-ce-915306ec50c50b3b1b0793150a7cb4f31fbbee75.tar.gz | |
Merge branch 'master' into 'alerts-for-built-in-metrics'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'config/initializers/fog_google_https_private_urls.rb')
| -rw-r--r-- | config/initializers/fog_google_https_private_urls.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/fog_google_https_private_urls.rb b/config/initializers/fog_google_https_private_urls.rb index c65a534b536..682b1050c68 100644 --- a/config/initializers/fog_google_https_private_urls.rb +++ b/config/initializers/fog_google_https_private_urls.rb @@ -9,7 +9,7 @@ module Fog module MonkeyPatch def url(expires, options = {}) requires :key - collection.get_https_url(key, expires) + collection.get_https_url(key, expires, options) end end |