diff options
| -rw-r--r-- | Changelog.md | 3 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | features/support/env.rb | 6 |
4 files changed, 9 insertions, 8 deletions
diff --git a/Changelog.md b/Changelog.md index 60c334f4f..350946272 100644 --- a/Changelog.md +++ b/Changelog.md @@ -35,7 +35,7 @@ With this release, we switched from `unicorn` to `puma` to run our applications. We use yarn to install the frontend dependencies now, so you need to have that installed. See here for how to install it: https://yarnpkg.com/en/docs/install ## Refactor -* Add bootstrapping for using ECMAScript 6 with automatic transpiling for compatibility [#7581](https://github.com/diaspora/diaspora/pull/7581) +* Add bootstrapping for using ECMAScript 6 with automatic transpiling for compatibility [#7581](https://github.com/diaspora/diaspora/pull/7581) [#8397](https://github.com/diaspora/diaspora/pull/8397) * Remove backporting of mention syntax [#7788](https://github.com/diaspora/diaspora/pull/7788) * Enable Content-Security-Policy header by default [#7781](https://github.com/diaspora/diaspora/pull/7781) * Do not show getting started after account import [#8036](https://github.com/diaspora/diaspora/pull/8036) @@ -52,6 +52,7 @@ We use yarn to install the frontend dependencies now, so you need to have that i * Photo-upload file picker now correctly restricts possible file types [#8205](https://github.com/diaspora/diaspora/pull/8205) * Make inline code inside links show the link color [#8387](https://github.com/diaspora/diaspora/pull/8387) * Fix fetching public posts on first account search was missing some data [#8390](https://github.com/diaspora/diaspora/pull/8390) +* Add redirect from mobile UI photo URLs to post when not using mobile UI [#8400](https://github.com/diaspora/diaspora/pull/8400) ## Features * Add client-side cropping of profile image uploads [#7581](https://github.com/diaspora/diaspora/pull/7581) @@ -87,12 +87,12 @@ gem "uuid", "2.3.9" # JavaScript +gem "babel-transpiler", "0.7.0" gem "handlebars_assets", "0.23.9" gem "jquery-rails", "4.5.0" gem "jquery-ui-rails", "5.0.5" gem "js_image_paths", "0.2.0" gem "js-routes", "2.2.4" -gem "sprockets-es6", "0.9.2" # Localization diff --git a/Gemfile.lock b/Gemfile.lock index a45b16517..be3662252 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -679,10 +679,6 @@ GEM sprockets (4.1.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-es6 (0.9.2) - babel-source (>= 5.8.11) - babel-transpiler - sprockets (>= 3.0.0) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) @@ -780,6 +776,7 @@ DEPENDENCIES apparition (= 0.6.0) asset_sync (= 2.15.2) autoprefixer-rails (= 10.4.7.0) + babel-transpiler (= 0.7.0) bootstrap-sass (= 3.4.1) bootstrap-switch-rails (= 3.3.3) capybara (= 3.35.3) @@ -868,7 +865,6 @@ DEPENDENCIES simple_captcha2 (= 0.5.0) simplecov (= 0.21.2) sinon-rails (= 1.15.0) - sprockets-es6 (= 0.9.2) sprockets-rails (= 3.4.2) string-direction (= 1.2.2) terser (= 1.1.10) diff --git a/features/support/env.rb b/features/support/env.rb index d8cfcbd3a..9297993e1 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -26,7 +26,11 @@ Capybara.server = :webrick Capybara.register_driver :apparition do |app| # Pass headless: false here if you need to see the browser - Capybara::Apparition::Driver.new(app, headless: true) + Capybara::Apparition::Driver.new( + app, + headless: true, + browser_options: %i[no_sandbox disable_setuid_sandbox disable_gpu] + ) end Capybara.javascript_driver = :apparition |