Merge branch 'next-minor' into develop

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
 

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