From 74d027a3abb2d72306d7d9e8ff2d150ebe576960 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 25 Feb 2018 22:53:31 +0100 Subject: [PATCH 1/2] Set frozen config as boolean This is normalized to "true" in the config after running bin/bundle, so rerunning script/configure_bundler resets this back to 1 (which is the same, but we don't need to change this back and forth every time). --- script/configure_bundler | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/configure_bundler b/script/configure_bundler index 6c28ae7a0..1f30cca70 100755 --- a/script/configure_bundler +++ b/script/configure_bundler @@ -24,7 +24,7 @@ end if rails_env != "development" config("path vendor/bundle") - config("frozen 1") + config("frozen true") config("disable_shared_gems true") end From 9fa254b898cfc8d21128b6ac9d6056960329ba4d Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 25 Feb 2018 22:59:27 +0100 Subject: [PATCH 2/2] Use https:// for media-embed tests I overlooked this when reviewing #6418 since it is excluded on travis because of the @nophantomjs tag (so it didn't fail). But since we block http:// embeds now, we need to use https:// for the tests. --- features/desktop/media-embed.feature | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/features/desktop/media-embed.feature b/features/desktop/media-embed.feature index 07efef81d..6df7da211 100644 --- a/features/desktop/media-embed.feature +++ b/features/desktop/media-embed.feature @@ -13,10 +13,10 @@ Feature: oembed And I sign in as "alice@alice.alice" Scenario: Post a video link - When I click the publisher and post "[title](http://example.com/file.ogv)" + When I click the publisher and post "[title](https://example.com/file.ogv)" Then I should see a HTML5 video player Scenario: Post an audio link - When I click the publisher and post "[title](http://example.com/file.ogg)" + When I click the publisher and post "[title](https://example.com/file.ogg)" Then I should see a HTML5 audio player