Merge pull request #1585 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
master
Claire 3 years ago committed by GitHub
commit 4a364de500
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .circleci/config.yml
  2. 2
      .nvmrc
  3. 4
      Dockerfile
  4. 2
      Vagrantfile
  5. 6
      app/models/account.rb
  6. 1
      spec/services/activitypub/process_account_service_spec.rb

@ -209,7 +209,7 @@ jobs:
test-webui:
<<: *defaults
docker:
- image: circleci/node:12-buster
- image: circleci/node:14-buster
steps:
- *attach_workspace
- run:

@ -1 +1 @@
12
14

@ -3,8 +3,8 @@ FROM ubuntu:20.04 as build-dep
# Use bash for the shell
SHELL ["/bin/bash", "-c"]
# Install Node v12 (LTS)
ENV NODE_VER="12.21.0"
# Install Node v14 (LTS)
ENV NODE_VER="14.17.4"
RUN ARCH= && \
dpkgArch="$(dpkg --print-architecture)" && \
case "${dpkgArch##*-}" in \

2
Vagrantfile vendored

@ -12,7 +12,7 @@ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
sudo apt-add-repository 'deb https://dl.yarnpkg.com/debian/ stable main'
# Add repo for NodeJS
curl -sL https://deb.nodesource.com/setup_12.x | sudo bash -
curl -sL https://deb.nodesource.com/setup_14.x | sudo bash -
# Add firewall rule to redirect 80 to PORT and save
sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port #{ENV["PORT"]}

@ -299,7 +299,11 @@ class Account < ApplicationRecord
end
def fields
(self[:fields] || []).map { |f| Field.new(self, f) }
(self[:fields] || []).map do |f|
Field.new(self, f)
rescue
nil
end.compact
end
def fields_attributes=(attributes)

@ -12,6 +12,7 @@ RSpec.describe ActivityPub::ProcessAccountService, type: :service do
attachment: [
{ type: 'PropertyValue', name: 'Pronouns', value: 'They/them' },
{ type: 'PropertyValue', name: 'Occupation', value: 'Unit test' },
{ type: 'PropertyValue', name: 'non-string', value: ['foo', 'bar'] },
],
}.with_indifferent_access
end

Loading…
Cancel
Save