Merge branch 'next-minor' into develop
This commit is contained in:
commit
5e47c284b6
4 changed files with 10 additions and 6 deletions
|
|
@ -179,8 +179,6 @@ Layout/DotPosition:
|
||||||
Style/HashEachMethods:
|
Style/HashEachMethods:
|
||||||
Enabled: true
|
Enabled: true
|
||||||
|
|
||||||
# TODO: Enable with Ruby 2.5
|
# It makes more sense to allow to structure and group them how it makes sense in the code
|
||||||
Style/HashTransformKeys:
|
Style/AccessorGrouping:
|
||||||
Enabled: false
|
|
||||||
Style/HashTransformValues:
|
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class CreateSchema < ActiveRecord::Migration[4.2]
|
class CreateSchema < ActiveRecord::Migration[4.2]
|
||||||
# rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/LineLength, Layout/ExtraSpacing
|
# rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Layout/LineLength, Layout/ExtraSpacing
|
||||||
def up
|
def up
|
||||||
create_table :account_deletions do |t|
|
create_table :account_deletions do |t|
|
||||||
t.string :diaspora_handle
|
t.string :diaspora_handle
|
||||||
|
|
@ -672,5 +672,5 @@ class CreateSchema < ActiveRecord::Migration[4.2]
|
||||||
|
|
||||||
add_foreign_key :share_visibilities, :users, name: :share_visibilities_user_id_fk, on_delete: :cascade
|
add_foreign_key :share_visibilities, :users, name: :share_visibilities_user_id_fk, on_delete: :cascade
|
||||||
end
|
end
|
||||||
# rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/LineLength, Layout/ExtraSpacing
|
# rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Layout/LineLength, Layout/ExtraSpacing
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,9 @@ RUN DEBIAN_FRONTEND=noninteractive \
|
||||||
nodejs \
|
nodejs \
|
||||||
gosu \
|
gosu \
|
||||||
&& \
|
&& \
|
||||||
|
curl https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -o ./google-chrome.deb && \
|
||||||
|
apt install -y -qq --no-install-recommends ./google-chrome.deb && \
|
||||||
|
rm ./google-chrome.deb && \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,4 +5,7 @@ Jasmine.configure do |config|
|
||||||
config.runner_browser = :chromeheadless
|
config.runner_browser = :chromeheadless
|
||||||
config.chrome_startup_timeout = 20
|
config.chrome_startup_timeout = 20
|
||||||
config.chrome_cli_options["autoplay-policy"] = "no-user-gesture-required"
|
config.chrome_cli_options["autoplay-policy"] = "no-user-gesture-required"
|
||||||
|
config.chrome_cli_options["disable-gpu"] = nil
|
||||||
|
config.chrome_cli_options["disable-software-rasterizer"] = nil
|
||||||
|
config.chrome_cli_options["disable-dev-shm-usage"] = nil
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue