summaryrefslogtreecommitdiff
path: root/spec/initializers/settings_spec.rb
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-01-24 10:11:30 +0100
committerAchilleas Pipinellis <axil@gitlab.com>2018-01-25 10:00:46 +0100
commit85940d766a30edb707b3e5154f38ae90c935e0a2 (patch)
tree7c64b81de3a7a977b9ff258edc5d780fd2efc39d /spec/initializers/settings_spec.rb
parent8f5d1d1371b47ab810a9e5ddff483f669d149363 (diff)
downloadgitlab-ce-85940d766a30edb707b3e5154f38ae90c935e0a2.tar.gz
Default to HTTPS for all Gravatar URLsdefault-to-https-for-gravatar-urls
If using gravatar.com, both plain_url and ssl_url in settings are now served via HTTPS. Make this the default.
Diffstat (limited to 'spec/initializers/settings_spec.rb')
-rw-r--r--spec/initializers/settings_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/initializers/settings_spec.rb b/spec/initializers/settings_spec.rb
index a11824d0ac5..838ca9fabef 100644
--- a/spec/initializers/settings_spec.rb
+++ b/spec/initializers/settings_spec.rb
@@ -24,7 +24,7 @@ describe Settings do
expect(described_class.host_without_www('http://foo.com')).to eq 'foo.com'
expect(described_class.host_without_www('http://www.foo.com')).to eq 'foo.com'
expect(described_class.host_without_www('http://secure.foo.com')).to eq 'secure.foo.com'
- expect(described_class.host_without_www('http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon')).to eq 'gravatar.com'
+ expect(described_class.host_without_www('https://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon')).to eq 'gravatar.com'
expect(described_class.host_without_www('https://foo.com')).to eq 'foo.com'
expect(described_class.host_without_www('https://www.foo.com')).to eq 'foo.com'