nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Benjamin Neff 2018-02-25 23:03:17 +01:00
commit 198dddd69e
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
features/desktop/media-embed.feature
View file

@ -13,10 +13,10 @@ Feature: oembed
And I sign in as "alice@alice.alice" And I sign in as "alice@alice.alice"
Scenario: Post a video link 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 Then I should see a HTML5 video player
Scenario: Post an audio link 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 Then I should see a HTML5 audio player

2
script/configure_bundler
View file

@ -24,7 +24,7 @@ end
if rails_env != "development" if rails_env != "development"
config("path vendor/bundle") config("path vendor/bundle")
config("frozen 1") config("frozen true")
config("disable_shared_gems true") config("disable_shared_gems true")
end end