Merge remote-tracking branch 'origin/dev' into housekeeping/remove-angularjs

.buildpacks

@@ -1,2 +1,2 @@
 https://github.com/heroku/heroku-buildpack-nodejs.git#v106
-https://github.com/pkgr/heroku-buildpack-ruby.git#v183-1
+https://github.com/pkgr/heroku-buildpack-ruby.git#v199-1

.jshintignore

@@ -1,6 +1,5 @@
 app/assets/javascripts/date-de-DE.js
 app/assets/javascripts/date-en-US.js
-app/assets/javascripts/jstoolbar/**/*
 app/assets/javascripts/jquery_noconflict.js
 app/assets/javascripts/project/**/*
 app/assets/javascripts/lib/**/*

.pkgr.yml

@@ -40,5 +40,5 @@ wizards:
   - https://github.com/finnlabs/addon-repositories.git
   - https://github.com/pkgr/addon-smtp.git
   - https://github.com/pkgr/addon-memcached.git
-  - https://github.com/opf/addon-openproject.git#dynamic-node-dependencies
+  - https://github.com/opf/addon-openproject.git
 buildpack: https://github.com/opf/heroku-buildpack-multi.git

.rubocop.yml

@@ -271,3 +271,7 @@ UnderscorePrefixedVariableName:
 
 Void:
   Enabled: false
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: false
+

.travis.yml

@@ -91,10 +91,16 @@ jobs:
       - bash script/ci/runner.sh spec_legacy 1 1
       if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
-      name: 'spec_legacy (1/1) - postgres'
+      name: 'spec_legacy (1/1) - postgres standard'
       script:
       - bash script/ci/setup.sh spec_legacy postgres
       - bash script/ci/runner.sh spec_legacy 1 1
+    - stage: test
+      name: 'spec_legacy (1/1) - postgres bim'
+      script:
+        - bash script/ci/setup.sh spec_legacy postgres bim
+        - bash script/ci/runner.sh spec_legacy 1 1
+      if: head_branch =~ /^(bim\/|dev|release\/)/
     - stage: test
       name: 'units (1/4) - mysql'
       script:
@@ -102,10 +108,16 @@ jobs:
       - bash script/ci/runner.sh units 4 1
       if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
-      name: 'units (1/4) - postgres'
+      name: 'units (1/4) - postgres standard'
       script:
       - bash script/ci/setup.sh units postgres
       - bash script/ci/runner.sh units 4 1
+    - stage: test
+      name: 'units (1/4) - postgres bim'
+      script:
+        - bash script/ci/setup.sh units postgres bim
+        - bash script/ci/runner.sh units 4 1
+      if: head_branch =~ /^(bim\/|dev|release\/)/
     - stage: test
       name: 'units (2/4) - mysql'
       script:
@@ -113,10 +125,16 @@ jobs:
       - bash script/ci/runner.sh units 4 2
       if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
-      name: 'units (2/4) - postgres'
+      name: 'units (2/4) - postgres standard'
       script:
       - bash script/ci/setup.sh units postgres
       - bash script/ci/runner.sh units 4 2
+    - stage: test
+      name: 'units (2/4) - postgres bim'
+      script:
+        - bash script/ci/setup.sh units postgres bim
+        - bash script/ci/runner.sh units 4 2
+      if: head_branch =~ /^(bim\/|dev|release\/)/
     - stage: test
       name: 'units (3/4) - mysql'
       script:
@@ -124,10 +142,16 @@ jobs:
       - bash script/ci/runner.sh units 4 3
       if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
-      name: 'units (3/4) - postgres'
+      name: 'units (3/4) - postgres standard'
       script:
       - bash script/ci/setup.sh units postgres
       - bash script/ci/runner.sh units 4 3
+    - stage: test
+      name: 'units (3/4) - postgres bim'
+      script:
+        - bash script/ci/setup.sh units postgres bim
+        - bash script/ci/runner.sh units 4 3
+      if: head_branch =~ /^(bim\/|dev|release\/)/
     - stage: test
       name: 'units (4/4) - mysql'
       script:
@@ -135,10 +159,16 @@ jobs:
       - bash script/ci/runner.sh units 4 4
       if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
-      name: 'units (4/4) - postgres'
+      name: 'units (4/4) - postgres standard'
       script:
       - bash script/ci/setup.sh units postgres
       - bash script/ci/runner.sh units 4 4
+    - stage: test
+      name: 'units (4/4) - postgres bim'
+      script:
+      - bash script/ci/setup.sh units postgres bim
+      - bash script/ci/runner.sh units 4 4
+      if: head_branch =~ /^(bim\/|dev|release\/)/
     - stage: test
       name: 'features (1/4) - mysql'
       script:
@@ -146,10 +176,16 @@ jobs:
       - bash script/ci/runner.sh features 4 1
       if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
-      name: 'features (1/4) - postgres'
+      name: 'features (1/4) - postgres standard'
       script:
       - bash script/ci/setup.sh features postgres
       - bash script/ci/runner.sh features 4 1
+    - stage: test
+      name: 'features (1/4) - postgres bim'
+      script:
+      - bash script/ci/setup.sh features postgres bim
+      - bash script/ci/runner.sh features 4 1
+      if: head_branch =~ /^(bim\/|dev|release\/)/
     - stage: test
       name: 'features (2/4) - mysql'
       script:
@@ -157,10 +193,16 @@ jobs:
       - bash script/ci/runner.sh features 4 2
       if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
-      name: 'features (2/4) - postgres'
+      name: 'features (2/4) - postgres standard'
       script:
       - bash script/ci/setup.sh features postgres
       - bash script/ci/runner.sh features 4 2
+    - stage: test
+      name: 'features (2/4) - postgres bim'
+      script:
+      - bash script/ci/setup.sh features postgres bim
+      - bash script/ci/runner.sh features 4 2
+      if: head_branch =~ /^(bim\/|dev|release\/)/
     - stage: test
       name: 'features (3/4) - mysql'
       script:
@@ -168,10 +210,16 @@ jobs:
       - bash script/ci/runner.sh features 4 3
       if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
-      name: 'features (3/4) - postgres'
+      name: 'features (3/4) - postgres standard'
       script:
       - bash script/ci/setup.sh features postgres
       - bash script/ci/runner.sh features 4 3
+    - stage: test
+      name: 'features (3/4) - postgres bim'
+      script:
+      - bash script/ci/setup.sh features postgres bim
+      - bash script/ci/runner.sh features 4 3
+      if: head_branch =~ /^(bim\/|dev|release\/)/
     - stage: test
       name: 'features (4/4) - mysql'
       script:
@@ -179,10 +227,16 @@ jobs:
       - bash script/ci/runner.sh features 4 4
       if: env(SKIP_MYSQL_TESTING) IS blank
     - stage: test
-      name: 'features (4/4) - postgres'
+      name: 'features (4/4) - postgres standard'
       script:
       - bash script/ci/setup.sh features postgres
       - bash script/ci/runner.sh features 4 4
+    - stage: test
+      name: 'features (4/4) - postgres bim'
+      script:
+      - bash script/ci/setup.sh features postgres bim
+      - bash script/ci/runner.sh features 4 4
+      if: head_branch =~ /^(bim\/|dev|release\/)/
     - stage: test
       name: 'plugins:units (1/1) - mysql'
       script:
@@ -190,11 +244,17 @@ jobs:
       - bash script/ci/runner.sh plugins:units 1 1
       if: env(SKIP_MYSQL_TESTING) IS blank AND head_branch !~ /^core\//
     - stage: test
-      name: 'plugins:units (1/1) - postgres'
+      name: 'plugins:units (1/1) - postgres standard'
       script:
       - bash script/ci/setup.sh plugins:units postgres
       - bash script/ci/runner.sh plugins:units 1 1
       if: head_branch !~ /^core\//
+    - stage: test
+      name: 'plugins:units (1/1) - postgres bim'
+      script:
+      - bash script/ci/setup.sh plugins:units postgres bim
+      - bash script/ci/runner.sh plugins:units 1 1
+      if: head_branch =~ /^(bim\/|dev|release\/)/
     - stage: test
       name: 'plugins:features (1/1) - mysql'
       script:
@@ -202,11 +262,17 @@ jobs:
       - bash script/ci/runner.sh plugins:features 1 1
       if: env(SKIP_MYSQL_TESTING) IS blank AND head_branch !~ /^core\//
     - stage: test
-      name: 'plugins:features (1/1) - postgres'
+      name: 'plugins:features (1/1) - postgres standard'
       script:
       - bash script/ci/setup.sh plugins:features postgres
       - bash script/ci/runner.sh plugins:features 1 1
       if: head_branch !~ /^core\//
+    - stage: test
+      name: 'plugins:features (1/1) - postgres bim'
+      script:
+      - bash script/ci/setup.sh plugins:features postgres bim
+      - bash script/ci/runner.sh plugins:features 1 1
+      if: head_branch =~ /^(bim\/|dev|release\/)/
     - stage: test
       name: 'plugins:cucumber (1/1) - mysql'
       script:
@@ -214,11 +280,17 @@ jobs:
       - bash script/ci/runner.sh plugins:cucumber 1 1
       if: env(SKIP_MYSQL_TESTING) IS blank AND head_branch !~ /^core\//
     - stage: test
-      name: 'plugins:cucumber (1/1) - postgres'
+      name: 'plugins:cucumber (1/1) - postgres standard'
       script:
       - bash script/ci/setup.sh plugins:cucumber postgres
       - bash script/ci/runner.sh plugins:cucumber 1 1
       if: head_branch !~ /^core\//
+    - stage: test
+      name: 'plugins:cucumber (1/1) - postgres bim'
+      script:
+      - bash script/ci/setup.sh plugins:cucumber postgres bim
+      - bash script/ci/runner.sh plugins:cucumber 1 1
+      if: head_branch =~ /^(bim\/|dev|release\/)/
 
 addons:
   chrome: stable

CONTRIBUTING.md

@@ -111,7 +111,7 @@ which are not labelled as `work in progress` by us.
 
 ## Security
 
-If you notice a security issue in OpenProject, please send us a gpg encrypted email to security@openproject.org and describe the issue you found. Download our public gpg key [here](https://pgp.mit.edu/pks/lookup?op=get&search=0x7D669C6D47533958).
+If you notice a security issue in OpenProject, please send us a gpg encrypted email to security@openproject.com and describe the issue you found. Download our public gpg key [here](https://pgp.mit.edu/pks/lookup?op=get&search=0x7D669C6D47533958).
 
 Please include a description on how to reproduce the issue if possible. Our security team will get your email and will attempt to reproduce and fix the issue as soon as possible.
 

Dockerfile

@@ -1,36 +1,67 @@
 FROM ruby:2.6-stretch
+MAINTAINER operations@openproject.com
 
-ENV NODE_VERSION="10.15.0"
-ENV BUNDLER_VERSION="2.0.1"
+ENV NODE_VERSION "10.15.0"
+ENV BUNDLER_VERSION "2.0.1"
 ENV APP_USER app
-ENV APP_PATH /usr/src/app
-ENV APP_DATA /var/db/openproject
-ENV ATTACHMENTS_STORAGE_PATH /var/db/openproject/files
+ENV APP_PATH /app
+ENV APP_DATA_PATH /var/openproject/assets
+ENV APP_DATA_PATH_LEGACY /var/db/openproject
+ENV PGDATA /var/openproject/pgdata
+ENV PGDATA_LEGACY /var/lib/postgresql/9.6/main
+
+ENV DATABASE_URL postgres://openproject:openproject@127.0.0.1/openproject
+ENV RAILS_ENV production
+ENV HEROKU true
+ENV RAILS_CACHE_STORE memcache
+ENV OPENPROJECT_INSTALLATION__TYPE docker
+ENV NEW_RELIC_AGENT_ENABLED false
+ENV ATTACHMENTS_STORAGE_PATH $APP_DATA_PATH/files
+
+ENV PGLOADER_DEPENDENCIES "libsqlite3-dev make curl gawk freetds-dev libzip-dev"
 
 # Set a default key base, ensure to provide a secure value in production environments!
-ENV SECRET_KEY_BASE=OVERWRITE_ME
+ENV SECRET_KEY_BASE OVERWRITE_ME
 
 # install node + npm
 RUN curl https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.gz | tar xzf - -C /usr/local --strip-components=1
 
 RUN apt-get update -qq && \
-	DEBIAN_FRONTEND=noninteractive apt-get install -y  \
-	postgresql-client \
-    	mysql-client \
-    	sqlite \
-	poppler-utils \
-	unrtf \
-	tesseract-ocr \
-	catdoc && \
-	apt-get clean && rm -rf /var/lib/apt/lists/*
+    DEBIAN_FRONTEND=noninteractive apt-get install -y  \
+    postgresql-client \
+    mysql-client \
+    poppler-utils \
+    unrtf \
+    tesseract-ocr \
+    catdoc \
+    memcached \
+    postfix \
+    postgresql \
+    $PGLOADER_DEPENDENCIES \
+    apache2 \
+    supervisor && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# pgloader
+ENV CCL_DEFAULT_DIRECTORY /opt/ccl
+COPY docker/mysql-to-postgres/bin/build /tmp/build-pgloader
+RUN /tmp/build-pgloader && rm /tmp/build-pgloader
+# Add MySQL-to-Postgres migration script to path (used in entrypoint.sh)
+COPY docker/mysql-to-postgres/bin/migrate-mysql-to-postgres /usr/local/bin/
+
+# Set up pg defaults
+RUN echo "host all  all    0.0.0.0/0  md5" >> /etc/postgresql/9.6/main/pg_hba.conf
+RUN echo "listen_addresses='*'" >> /etc/postgresql/9.6/main/postgresql.conf
+RUN echo "data_directory='$PGDATA'" >> /etc/postgresql/9.6/main/postgresql.conf
+RUN rm -rf "$PGDATA_LEGACY" && rm -rf "$PGDATA" && mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA"
+RUN a2enmod proxy proxy_http && rm -f /etc/apache2/sites-enabled/000-default.conf
 
 # using /home/app since npm cache and other stuff will be put there when running npm install
 # we don't want to pollute any locally-mounted directory
 RUN useradd -d /home/$APP_USER -m $APP_USER
-RUN mkdir -p $APP_PATH $APP_DATA
-RUN gem install bundler --version "${bundler_version}" --no-document
 
 WORKDIR $APP_PATH
+RUN gem install bundler --version "${bundler_version}" --no-document
 
 COPY Gemfile ./Gemfile
 COPY Gemfile.* ./
@@ -40,32 +71,25 @@ RUN mkdir -p lib/open_project
 COPY lib/open_project/version.rb ./lib/open_project/
 RUN bundle install --deployment --with="docker opf_plugins" --without="test development" --jobs=8 --retry=3
 
-# Then, npm install node modules
-COPY package.json /tmp/npm/package.json
-COPY frontend/*.json /tmp/npm/frontend/
-RUN cd /tmp/npm/frontend/ && RAILS_ENV=production npm install && mv /tmp/npm/frontend /usr/src/app/
-
 # Finally, copy over the whole thing
-COPY . /usr/src/app
-RUN cp docker/Procfile .
+COPY . $APP_PATH
+
 RUN sed -i "s|Rails.groups(:opf_plugins)|Rails.groups(:opf_plugins, :docker)|" config/application.rb
 
 # Ensure we can write in /tmp/op_uploaded_files (cf. #29112)
-RUN mkdir -p /tmp/op_uploaded_files/
-RUN chown -R $APP_USER:$APP_USER /tmp/op_uploaded_files/
-
-# Allow uploading avatars w/ postgres
-RUN chown -R $APP_USER:$APP_USER $APP_DATA
+RUN mkdir -p /tmp/op_uploaded_files/ && chown -R $APP_USER:$APP_USER /tmp/op_uploaded_files/
 
 # Re-use packager database.yml
 COPY packaging/conf/database.yml ./config/database.yml
 
 # Run the npm postinstall manually after it was copied
-RUN DATABASE_URL=sqlite3:///tmp/db.sqlite3 RAILS_ENV=production bundle exec rake assets:precompile
+# Then, npm install node modules
+RUN bash docker/precompile-assets.sh
 
-# Include pandoc
-RUN DATABASE_URL=sqlite3:///tmp/db.sqlite3 RAILS_ENV=production bundle exec rails runner "puts ::OpenProject::TextFormatting::Formats::Markdown::PandocDownloader.check_or_download!"
+# ports
+EXPOSE 80 5432
 
-CMD ["./docker/web"]
+# volumes to export
+VOLUME ["$PGDATA", "$APP_DATA_PATH"]
 ENTRYPOINT ["./docker/entrypoint.sh"]
-VOLUME ["$APP_DATA"]
+CMD ["./docker/supervisord"]

Dockerfile.public

@@ -1,39 +0,0 @@
-FROM openproject/community:edge-base
-MAINTAINER operations@openproject.com
-
-ENV DATABASE_URL=postgres://openproject:openproject@127.0.0.1/openproject
-ENV RAILS_ENV=production
-ENV HEROKU=true
-ENV ATTACHMENTS_STORAGE_PATH=/var/db/openproject/files
-ENV RAILS_CACHE_STORE=memcache
-ENV SECRET_KEY_BASE=OVERWRITE_ME
-ENV OPENPROJECT_INSTALLATION__TYPE=docker
-
-USER root
-RUN apt-get update -qq && \
-	DEBIAN_FRONTEND=noninteractive apt-get install -y \
-		memcached \
-		postfix \
-		postgresql \
-		apache2 \
-		supervisor \
-		pandoc && \
-	apt-get clean && rm -rf /var/lib/apt/lists/*
-
-RUN a2enmod proxy proxy_http && rm -f /etc/apache2/sites-enabled/000-default.conf
-
-RUN echo "host all  all    0.0.0.0/0  md5" >> /etc/postgresql/9.6/main/pg_hba.conf
-RUN echo "listen_addresses='*'" >> /etc/postgresql/9.6/main/postgresql.conf
-RUN rm -rf /var/lib/postgresql/9.6/main && mkdir -p /var/lib/postgresql/9.6/main && chown -R postgres:postgres /var/lib/postgresql/9.6
-RUN mkdir -p /var/db/openproject/{files,git,svn} && chown -R app:app /var/db/openproject
-
-COPY docker /usr/src/app/docker
-COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-# ports
-EXPOSE 80 5432
-
-# volumes to export
-VOLUME ["/var/lib/postgresql/9.6/main", "/var/db/openproject"]
-
-ENTRYPOINT ["/usr/src/app/docker/entrypoint-all-in-one.sh"]

Gemfile

@@ -34,7 +34,7 @@ gem 'actionpack-xml_parser', '~> 2.0.0'
 gem 'activemodel-serializers-xml', '~> 1.0.1'
 gem 'activerecord-import', '~> 0.28.1'
 gem 'activerecord-session_store', '~> 1.1.0'
-gem 'rails', '~> 5.2.2'
+gem 'rails', '~> 5.2.2.1'
 gem 'responders', '~> 2.4'
 
 gem 'rdoc', '>= 2.4.2'
@@ -138,8 +138,7 @@ gem 'lograge', '~> 0.10.0'
 # don't require by default, instead load on-demand when actually configured
 gem 'airbrake', '~> 8.0.1', require: false
 
-gem 'transactional_lock', git: 'https://github.com/finnlabs/transactional_lock.git',
-                          branch: 'master'
+gem 'with_advisory_lock'
 
 gem 'prawn', '~> 2.2'
 gem 'prawn-table', '~> 0.2.2'
@@ -153,7 +152,9 @@ group :production do
   # we use dalli as standard memcache client
   # requires memcached 1.4+
   # see https://github.clientom/mperham/dalli
-  gem 'dalli', '~> 2.7.6'
+  gem 'dalli',
+      git: 'https://github.com/petergoldstein/dalli',
+      ref: '0ff39199b5e91c6dbdaabc7c085b81938d0f08d2'
 
   # Unicorn worker killer to restart unicorn child workers
   gem 'unicorn-worker-killer', require: false
@@ -163,7 +164,6 @@ gem 'autoprefixer-rails', '~> 9.4.5'
 # use until proper release no longer requiring sass exists
 gem 'bourbon', git: 'https://github.com/sikachu/bourbon', ref: 'a12ca168e74d3468c80500b21b525a4e12a19ef9'
 gem 'i18n-js', '~> 3.2.0'
-gem 'sass-rails'
 gem 'sassc-rails', '~> 2.1.0'
 gem 'sprockets', '~> 3.7.0'
 
@@ -171,7 +171,7 @@ gem 'sprockets', '~> 3.7.0'
 # also, better than thin since we can control worker concurrency.
 gem 'unicorn'
 
-gem 'nokogiri', '~> 1.10.0'
+gem 'nokogiri', '~> 1.10.3'
 
 gem 'carrierwave', '~> 1.3.1'
 gem 'fog-aws'
@@ -247,7 +247,7 @@ end
 group :development do
   gem 'faker'
   gem 'letter_opener'
-  gem 'livingstyleguide', '~> 2.0.1'
+  gem 'livingstyleguide', '~> 2.1.0'
 
   gem 'spring'
   gem 'spring-commands-rspec'
@@ -271,7 +271,7 @@ group :development, :test do
   gem 'pry-stack_explorer', '~> 0.4.9.2'
 end
 
-gem 'bootsnap', '~> 1.3.2', require: true
+gem 'bootsnap', '~> 1.3.2', require: false
 
 # API gems
 gem 'grape', '~> 1.2.3'
@@ -288,6 +288,9 @@ platforms :mri, :mingw, :x64_mingw do
   group :postgres do
     gem 'pg', '~> 1.1.0'
   end
+
+  # Support application loading when no database exists yet.
+  gem 'activerecord-nulldb-adapter', '~> 0.3.9'
 end
 
 group :opf_plugins do
@@ -298,11 +301,8 @@ group :docker, optional: true do
   gem 'passenger', '~> 6.0.1'
 
   # Used to easily precompile assets
-  gem 'health_check', require: !!ENV['HEROKU']
   gem 'newrelic_rpm', require: !!ENV['HEROKU']
   gem 'rails_12factor', require: !!ENV['HEROKU']
-  # Require specific version of sqlite3 for rails
-  gem 'sqlite3', '~> 1.3.6', require: false
 end
 
 # Load Gemfile.local, Gemfile.plugins, plugins', and custom Gemfiles

Gemfile.lock

@@ -16,8 +16,8 @@ GIT
 
 GIT
   remote: https://github.com/finnlabs/omniauth-openid-connect.git
-  revision: 46f0c33bee2c885c89dd2866f5cf847da62b3482
-  ref: 46f0c33bee2c885c89dd2866f5cf847da62b3482
+  revision: 9e7fd0e7bd36d40451c6b3c2ea641e8d237c295d
+  ref: 9e7fd0e7bd36d40451c6b3c2ea641e8d237c295d
   specs:
     omniauth-openid-connect (0.3.0)
       addressable (~> 2.5)
@@ -26,10 +26,10 @@ GIT
 
 GIT
   remote: https://github.com/finnlabs/omniauth-openid_connect-providers.git
-  revision: b8b9d4be88fb48a1fa4f4afd9fd226dac54430f8
-  ref: b8b9d4be88fb48a1fa4f4afd9fd226dac54430f8
+  revision: 1d65afd2cbb0ff9cd294a764a4387e0fb36c92f4
+  ref: 1d65afd2cbb0ff9cd294a764a4387e0fb36c92f4
   specs:
-    omniauth-openid_connect-providers (0.1.0)
+    omniauth-openid_connect-providers (0.1.1)
       omniauth-openid-connect (>= 0.2.1)
 
 GIT
@@ -38,14 +38,6 @@ GIT
   specs:
     rspec-example_disabler (0.0.1)
 
-GIT
-  remote: https://github.com/finnlabs/transactional_lock.git
-  revision: 6948b1d446db0da5645e68ffeeddca1c4944c3bc
-  branch: master
-  specs:
-    transactional_lock (0.1.0)
-      activerecord (>= 4.0)
-
 GIT
   remote: https://github.com/goodwill/capybara-select2
   revision: 585192e4bb0db8d52e761ab68f08c17294806447
@@ -74,6 +66,13 @@ GIT
       mixlib-shellout (~> 2.1.0)
       rubyzip
 
+GIT
+  remote: https://github.com/petergoldstein/dalli
+  revision: 0ff39199b5e91c6dbdaabc7c085b81938d0f08d2
+  ref: 0ff39199b5e91c6dbdaabc7c085b81938d0f08d2
+  specs:
+    dalli (2.7.9)
+
 GIT
   remote: https://github.com/rspec/rspec-activemodel-mocks
   revision: 6136a778f8b21f4f45f6b4ad5c2e2533e6d4ddc6
@@ -94,109 +93,129 @@ GIT
 PATH
   remote: modules/auth_plugins
   specs:
-    openproject-auth_plugins (8.3.0)
+    openproject-auth_plugins (1.0.0)
       omniauth (~> 1.0)
 
 PATH
   remote: modules/auth_saml
   specs:
-    openproject-auth_saml (8.3.0)
+    openproject-auth_saml (1.0.0)
       omniauth-saml (~> 1.10.1)
 
 PATH
   remote: modules/avatars
   specs:
-    openproject-avatars (8.3.0)
+    openproject-avatars (1.0.0)
       fastimage (~> 2.1.0)
       gravatar_image_tag (~> 1.2.0)
 
 PATH
   remote: modules/backlogs
   specs:
-    openproject-backlogs (8.3.0)
+    openproject-backlogs (1.0.0)
       acts_as_silent_list (~> 3.0.0)
-      openproject-pdf_export (= 8.3.0)
+      openproject-pdf_export
+
+PATH
+  remote: modules/bcf
+  specs:
+    openproject-bcf (1.0.0)
+      activerecord-import
+      rails (~> 5)
+      rubyzip (~> 1.2)
+
+PATH
+  remote: modules/bim_seeder
+  specs:
+    openproject-bim_seeder (1.0.0)
+      openproject-bcf
 
 PATH
   remote: modules/boards
   specs:
-    openproject-boards (8.3.0)
+    openproject-boards (1.0.0)
 
 PATH
   remote: modules/costs
   specs:
-    openproject-costs (8.3.0)
+    openproject-costs (1.0.0)
 
 PATH
   remote: modules/documents
   specs:
-    openproject-documents (8.3.0)
+    openproject-documents (1.0.0)
 
 PATH
   remote: modules/github_integration
   specs:
-    openproject-github_integration (8.3.0)
+    openproject-github_integration (1.0.0)
       openproject-webhooks
 
 PATH
   remote: modules/global_roles
   specs:
-    openproject-global_roles (8.3.0)
+    openproject-global_roles (1.0.0)
 
 PATH
   remote: modules/grids
   specs:
-    grids (8.3.0)
+    grids (1.0.0)
 
 PATH
   remote: modules/ldap_groups
   specs:
-    openproject-ldap_groups (8.3.0)
+    openproject-ldap_groups (1.0.0)
 
 PATH
   remote: modules/meeting
   specs:
-    openproject-meeting (8.3.0)
+    openproject-meeting (1.0.0)
       icalendar (~> 2.5.0)
 
+PATH
+  remote: modules/my_page
+  specs:
+    my_page (1.0.0)
+      grids
+
 PATH
   remote: modules/my_project_page
   specs:
-    openproject-my_project_page (8.3.0)
+    openproject-my_project_page (1.0.0)
 
 PATH
   remote: modules/openid_connect
   specs:
-    openproject-openid_connect (8.3.0)
+    openproject-openid_connect (1.0.0)
       lobby_boy (~> 0.1.3)
       omniauth-openid_connect-providers (~> 0.1)
-      openproject-auth_plugins (~> 8.0)
+      openproject-auth_plugins
 
 PATH
   remote: modules/pdf_export
   specs:
-    openproject-pdf_export (8.3.0)
+    openproject-pdf_export (1.0.0)
       pdf-inspector (~> 1.3.0)
       prawn (~> 2.2)
 
 PATH
   remote: modules/reporting_engine
   specs:
-    reporting_engine (8.3.0)
+    reporting_engine (1.0.0)
       json
 
 PATH
   remote: modules/reporting
   specs:
-    openproject-reporting (8.3.0)
+    openproject-reporting (1.0.0)
       jquery-tablesorter (~> 1.25.5)
-      openproject-costs (= 8.3.0)
-      reporting_engine (>= 1.1.0)
+      openproject-costs
+      reporting_engine
 
 PATH
   remote: modules/two_factor_authentication
   specs:
-    openproject-two_factor_authentication (8.3.0)
+    openproject-two_factor_authentication (1.0.0)
       aws-sdk-sns (~> 1.1.0)
       messagebird-rest (~> 1.3.2)
       rotp (~> 3.3)
@@ -204,31 +223,31 @@ PATH
 PATH
   remote: modules/webhooks
   specs:
-    openproject-webhooks (8.3.0)
+    openproject-webhooks (1.0.0)
 
 PATH
   remote: modules/xls_export
   specs:
-    openproject-xls_export (8.3.0)
+    openproject-xls_export (1.0.0)
       spreadsheet (~> 0.8.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.3)
-    actioncable (5.2.2)
-      actionpack (= 5.2.2)
+    actioncable (5.2.2.1)
+      actionpack (= 5.2.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
+    actionmailer (5.2.2.1)
+      actionpack (= 5.2.2.1)
+      actionview (= 5.2.2.1)
+      activejob (= 5.2.2.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
+    actionpack (5.2.2.1)
+      actionview (= 5.2.2.1)
+      activesupport (= 5.2.2.1)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
@@ -236,38 +255,40 @@ GEM
     actionpack-xml_parser (2.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+    actionview (5.2.2.1)
+      activesupport (= 5.2.2.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2)
-      activesupport (= 5.2.2)
+    activejob (5.2.2.1)
+      activesupport (= 5.2.2.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
+    activemodel (5.2.2.1)
+      activesupport (= 5.2.2.1)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
+    activerecord (5.2.2.1)
+      activemodel (= 5.2.2.1)
+      activesupport (= 5.2.2.1)
       arel (>= 9.0)
     activerecord-import (0.28.1)
       activerecord (>= 3.2)
+    activerecord-nulldb-adapter (0.3.9)
+      activerecord (>= 2.0.0)
     activerecord-session_store (1.1.1)
       actionpack (>= 4.0)
       activerecord (>= 4.0)
       multi_json (~> 1.11, >= 1.11.2)
       rack (>= 1.5.2, < 3)
       railties (>= 4.0)
-    activestorage (5.2.2)
-      actionpack (= 5.2.2)
-      activerecord (= 5.2.2)
+    activestorage (5.2.2.1)
+      actionpack (= 5.2.2.1)
+      activerecord (= 5.2.2.1)
       marcel (~> 0.3.1)
-    activesupport (5.2.2)
+    activesupport (5.2.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -362,7 +383,7 @@ GEM
       descendants_tracker (~> 0.0.1)
     commonmarker (0.17.9)
       ruby-enum (~> 0.5)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
@@ -391,7 +412,6 @@ GEM
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
     daemons (1.3.1)
-    dalli (2.7.7)
     database_cleaner (1.7.0)
     date_validator (0.9.0)
       activemodel
@@ -436,7 +456,7 @@ GEM
     faker (1.9.1)
       i18n (>= 0.7)
     fastimage (2.1.5)
-    ffi (1.9.25)
+    ffi (1.10.0)
     flamegraph (0.9.5)
     fog-aws (3.3.0)
       fog-core (~> 2.1)
@@ -479,8 +499,6 @@ GEM
     hashdiff (0.3.8)
     hashery (2.1.2)
     hashie (3.6.0)
-    health_check (3.0.0)
-      railties (>= 5.0)
     html-pipeline (2.8.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
@@ -488,11 +506,11 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.5.3)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     i18n-js (3.2.1)
       i18n (>= 0.6.6)
-    icalendar (2.5.2)
+    icalendar (2.5.3)
       ice_cube (~> 0.16)
     ice_cube (0.16.3)
     ice_nine (0.11.2)
@@ -519,10 +537,10 @@ GEM
       addressable (~> 2.3)
     letter_opener (1.7.0)
       launchy (~> 2.2)
-    livingstyleguide (2.0.3)
+    livingstyleguide (2.1.0)
       minisyntax (>= 0.2.5)
       redcarpet
-      sass
+      sassc
       thor
       tilt
     lobby_boy (0.1.3)
@@ -565,7 +583,7 @@ GEM
     netrc (0.11.0)
     newrelic_rpm (6.0.0.351)
     nio4r (2.3.1)
-    nokogiri (1.10.1)
+    nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.1)
       nokogiri (~> 1.8, >= 1.8.4)
@@ -654,18 +672,18 @@ GEM
     rack_session_access (0.2.0)
       builder (>= 2.0.0)
       rack (>= 1.0.0)
-    rails (5.2.2)
-      actioncable (= 5.2.2)
-      actionmailer (= 5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      activemodel (= 5.2.2)
-      activerecord (= 5.2.2)
-      activestorage (= 5.2.2)
-      activesupport (= 5.2.2)
+    rails (5.2.2.1)
+      actioncable (= 5.2.2.1)
+      actionmailer (= 5.2.2.1)
+      actionpack (= 5.2.2.1)
+      actionview (= 5.2.2.1)
+      activejob (= 5.2.2.1)
+      activemodel (= 5.2.2.1)
+      activerecord (= 5.2.2.1)
+      activestorage (= 5.2.2.1)
+      activesupport (= 5.2.2.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.2)
+      railties (= 5.2.2.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)
@@ -681,18 +699,15 @@ GEM
       rails_stdout_logging
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
+    railties (5.2.2.1)
+      actionpack (= 5.2.2.1)
+      activesupport (= 5.2.2.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
     raindrops (0.19.0)
     rake (12.3.2)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
-      ffi (~> 1.0)
     rbtree (0.4.2)
     rdoc (6.1.1)
     redcarpet (3.4.0)
@@ -759,7 +774,7 @@ GEM
       iso8601
     ruby-enum (0.7.2)
       i18n
-    ruby-ole (1.2.12.1)
+    ruby-ole (1.2.12.2)
     ruby-prof (0.17.0)
     ruby-progressbar (1.10.0)
     ruby-rc4 (0.1.5)
@@ -771,19 +786,8 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
-    sass (3.7.3)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
-    sassc (2.0.0)
-      ffi (~> 1.9.6)
+    sassc (2.0.1)
+      ffi (~> 1.9)
       rake
     sassc-rails (2.1.0)
       railties (>= 4.0.0)
@@ -818,7 +822,6 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
     stackprof (0.2.12)
     stringex (2.8.5)
     svg-graph (2.1.3)
@@ -862,9 +865,9 @@ GEM
     validate_email (0.1.6)
       activemodel (>= 3.0)
       mail (>= 2.2.5)
-    validate_url (1.0.2)
+    validate_url (1.0.8)
       activemodel (>= 3.0.0)
-      addressable
+      public_suffix
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -885,6 +888,8 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
     will_paginate (3.1.6)
+    with_advisory_lock (4.0.0)
+      activerecord (>= 4.2)
     xpath (3.2.0)
       nokogiri (~> 1.8)
 
@@ -895,6 +900,7 @@ DEPENDENCIES
   actionpack-xml_parser (~> 2.0.0)
   activemodel-serializers-xml (~> 1.0.1)
   activerecord-import (~> 0.28.1)
+  activerecord-nulldb-adapter (~> 0.3.9)
   activerecord-session_store (~> 1.1.0)
   acts_as_list (~> 0.9.9)
   acts_as_tree (~> 2.8.0)
@@ -919,7 +925,7 @@ DEPENDENCIES
   cucumber (~> 3.1.0)
   cucumber-rails (~> 1.6.0)
   daemons
-  dalli (~> 2.7.6)
+  dalli!
   database_cleaner (~> 1.6)
   date_validator (~> 0.9.0)
   delayed_job_active_record (~> 4.1.1)
@@ -936,7 +942,6 @@ DEPENDENCIES
   gon (~> 6.2.1)
   grape (~> 1.2.3)
   grids!
-  health_check
   html-pipeline (~> 2.8.0)
   htmldiff
   i18n-js (~> 3.2.0)
@@ -944,14 +949,15 @@ DEPENDENCIES
   ladle
   launchy (~> 2.4.3)
   letter_opener
-  livingstyleguide (~> 2.0.1)
+  livingstyleguide (~> 2.1.0)
   lograge (~> 0.10.0)
   meta-tags (~> 2.11.0)
   multi_json (~> 1.13.1)
+  my_page!
   mysql2 (~> 0.5.0)
   net-ldap (~> 0.16.0)
   newrelic_rpm
-  nokogiri (~> 1.10.0)
+  nokogiri (~> 1.10.3)
   oj (~> 3.7.0)
   okcomputer (~> 1.17.3)
   omniauth!
@@ -962,6 +968,8 @@ DEPENDENCIES
   openproject-auth_saml!
   openproject-avatars!
   openproject-backlogs!
+  openproject-bcf!
+  openproject-bim_seeder!
   openproject-boards!
   openproject-costs!
   openproject-documents!
@@ -996,7 +1004,7 @@ DEPENDENCIES
   rack-protection (~> 2.0.0)
   rack-test (~> 1.1.0)
   rack_session_access
-  rails (~> 5.2.2)
+  rails (~> 5.2.2.1)
   rails-controller-testing (~> 1.0.2)
   rails_12factor
   rdoc (>= 2.4.2)
@@ -1021,7 +1029,6 @@ DEPENDENCIES
   ruby-progressbar (~> 1.10.0)
   rubytree!
   sanitize (~> 5.0.0)
-  sass-rails
   sassc-rails (~> 2.1.0)
   secure_headers (~> 6.0.0)
   selenium-webdriver (~> 3.14)
@@ -1032,7 +1039,6 @@ DEPENDENCIES
   spring
   spring-commands-rspec
   sprockets (~> 3.7.0)
-  sqlite3 (~> 1.3.6)
   stackprof
   stringex (~> 2.8.5)
   svg-graph (~> 2.1.0)
@@ -1040,7 +1046,6 @@ DEPENDENCIES
   test-prof (~> 0.7.3)
   thin (~> 1.7.2)
   timecop (~> 0.9.0)
-  transactional_lock!
   typed_dag (~> 2.0.2)
   tzinfo-data (~> 1.2018.9)
   unicorn
@@ -1049,6 +1054,7 @@ DEPENDENCIES
   warden-basic_auth (~> 0.2.1)
   webmock (~> 3.5.0)
   will_paginate (~> 3.1.0)
+  with_advisory_lock
 
 RUBY VERSION
    ruby 2.6.1p33

Gemfile.modules

@@ -10,11 +10,11 @@ end
 
 gem 'omniauth-openid_connect-providers',
 		git: 'https://github.com/finnlabs/omniauth-openid_connect-providers.git',
-		ref: 'b8b9d4be88fb48a1fa4f4afd9fd226dac54430f8'
+		ref: '1d65afd2cbb0ff9cd294a764a4387e0fb36c92f4'
 
 gem 'omniauth-openid-connect',
 		git: 'https://github.com/finnlabs/omniauth-openid-connect.git',
-		ref: '46f0c33bee2c885c89dd2866f5cf847da62b3482'
+		ref: '9e7fd0e7bd36d40451c6b3c2ea641e8d237c295d'
 
 group :opf_plugins do
     # included so that engines can reference OpenProject::Version
@@ -39,6 +39,10 @@ group :opf_plugins do
 	gem 'openproject-github_integration',        path: 'modules/github_integration'
 	gem 'openproject-ldap_groups',               path: 'modules/ldap_groups'
 
-    gem 'grids',                                 path: 'modules/grids'
+	gem 'grids',                                 path: 'modules/grids'
+	gem 'my_page',                               path: 'modules/my_page'
 	gem 'openproject-boards',                    path: 'modules/boards'
+
+	gem 'openproject-bim_seeder',                path: 'modules/bim_seeder', require: !!(ENV['OPENPROJECT_EDITION'] == 'bim')
+	gem 'openproject-bcf',                       path: 'modules/bcf',                       require: !!(ENV['OPENPROJECT_EDITION'] == 'bim')
 end

README.md

@@ -38,6 +38,8 @@ will keep our community secure. If you happen to come across a security issue we
 you to disclose it to us privately to allow our users and community enough time to
 upgrade. Security issues will always take precedence over anything else in the pipeline.
 
+For more information on how to disclosure a security vulnerability, [please see this page](docs/security/README.md).
+
 ## License
 
 OpenProject is licensed under the terms of the GNU General Public License version 3.

app/assets/fonts/openproject_icon/src/boards.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M136.298 106.01v398.933H2.55V106.01zm0-98.351V59.24H2.55V7.66zm186.577 97.267v150.357h-133.75V104.926zm0-98.159V60.62h-133.75V6.767zm189.83 100.921v275.098h-133.75V107.688zm0-102.264V60.62h-133.75V5.424z"/></svg>

app/assets/fonts/openproject_icon/src/export-bcf.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M448 86L329-32H54v512h394zM100 434V14h210l92 92v328z"/><g aria-label="BCF" style="line-height:1.25" font-weight="700" font-size="121.691" font-family="Arial" letter-spacing="0" word-spacing="0" stroke-width="3.042"><path d="M142.65 305.176h32.152q9.547 0 14.21.965 4.719.9 8.395 3.86 3.731 2.96 6.2 7.916 2.47 4.89 2.47 11.004 0 6.628-3.073 12.162-3.018 5.534-8.23 8.3 7.352 2.51 11.302 8.56 3.95 6.048 3.95 14.22 0 6.435-2.578 12.549-2.524 6.048-6.968 9.716-4.39 3.604-10.864 4.44-4.06.515-19.587.644H142.65zm16.24 15.7v21.815h10.645q9.492 0 11.796-.321 4.17-.58 6.53-3.347 2.413-2.83 2.413-7.4 0-4.375-2.084-7.078-2.03-2.767-6.09-3.346-2.415-.322-13.882-.322zm0 37.517v25.225h15.034q8.779 0 11.138-.58 3.621-.772 5.87-3.732 2.305-3.024 2.305-8.043 0-4.248-1.755-7.208-1.756-2.96-5.103-4.311-3.292-1.351-14.375-1.351zM275.263 364.828l15.747 5.855q-3.621 15.444-12.07 22.973-8.396 7.465-21.344 7.465-16.021 0-26.336-12.806-10.315-12.87-10.315-35.135 0-23.552 10.37-36.55 10.37-13.063 27.269-13.063 14.759 0 23.976 10.231 5.487 6.05 8.23 17.375l-16.076 4.504q-1.426-7.336-5.98-11.583-4.5-4.247-10.973-4.247-8.944 0-14.54 7.53-5.542 7.528-5.542 24.388 0 17.889 5.487 25.482t14.265 7.593q6.475 0 11.138-4.826 4.664-4.826 6.694-15.186zM305.11 399.512v-94.336h55.142v15.958H321.35v22.33h33.578v15.958h-33.578v40.09z" style="-inkscape-font-specification:'Arial Bold'"/></g></svg>

app/assets/fonts/openproject_icon/src/import.svg

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 512 512"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="import.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.921875"
+     inkscape:cx="146.58296"
+     inkscape:cy="243.92363"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M 321,224 190,92 l 0,100 -190,0 0,64 190,0 0,100 z"
+     id="path828"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 94,-32 318,0 0,512 -318,0 V 320 l 64,0 0,96 190,0 0,-384 -190,0 0,96 H 94 Z"
+     id="path2"
+     inkscape:connector-curvature="0" />
+</svg>