diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-25 18:33:50 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-25 18:33:50 +0000 |
| commit | 1f10fa8cee8ffb5587ad037d8d8d7c5371264cf4 (patch) | |
| tree | eeb1844c4c7f192ed281efe1f13fea9271623ef1 /spec/initializers/settings_spec.rb | |
| parent | 6b24028b0d0240ad55790b9d1f1493b6e56afc94 (diff) | |
| parent | eaa37a4445b303de3665625c6541c914fb1f118b (diff) | |
| download | gitlab-ce-1f10fa8cee8ffb5587ad037d8d8d7c5371264cf4.tar.gz | |
Merge branch 'master' into fl-mr-widget-components
* master:
Open links in a new tab on the user page
Improve empty project overview
Make Gitaly RepositoryExists opt-out
Fix .batch_lfs_pointers accepting a lazy enumerator
Look for rugged with static analysis
Look at notes created just before merge when deciding if an MR can be reverted
Cache rubocop cache for CI
Update gitlab-styles and re-enable the RSpec/SingleLineHook cop again
Make Gitlab::Git::Repository#run_git private
Default to HTTPS for all Gravatar URLs
Handle special characters on API request of issuable templates
Update secret_values to support dynamic elements within parent
Add note within ux documentation that further changes should be made within the design.gitlab project
Disable throwOnError in KaTeX to reveal user where is the problem
Diffstat (limited to 'spec/initializers/settings_spec.rb')
| -rw-r--r-- | spec/initializers/settings_spec.rb | 2 |
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' |