From ce877d8de56386de284182676167424fb2631bbe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Mar 2021 12:57:51 +0000 Subject: [PATCH 1/9] Bump yargs-parser from 5.0.0 to 5.0.1 Bumps [yargs-parser](https://github.com/yargs/yargs-parser) from 5.0.0 to 5.0.1. - [Release notes](https://github.com/yargs/yargs-parser/releases) - [Changelog](https://github.com/yargs/yargs-parser/blob/v5.0.1/CHANGELOG.md) - [Commits](https://github.com/yargs/yargs-parser/compare/v5.0.0...v5.0.1) Signed-off-by: dependabot[bot] --- yarn.lock | 45 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/yarn.lock b/yarn.lock index a12afcf1b..e3edfe85c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1900,6 +1900,14 @@ cacheable-request@^2.1.1: normalize-url "2.0.1" responselike "1.0.2" +call-bind@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.2" + call-me-maybe@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b" @@ -4185,6 +4193,15 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== +get-intrinsic@^1.0.2: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" @@ -4408,6 +4425,11 @@ has-symbols@^1.0.0: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q= +has-symbols@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== + has-to-string-tag-x@^1.2.0: version "1.4.1" resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d" @@ -6403,7 +6425,7 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-keys@^1.0.11, object-keys@^1.0.12: +object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== @@ -6421,14 +6443,14 @@ object-visit@^1.0.0: isobject "^3.0.0" object.assign@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" - integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w== + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== dependencies: - define-properties "^1.1.2" - function-bind "^1.1.1" - has-symbols "^1.0.0" - object-keys "^1.0.11" + call-bind "^1.0.0" + define-properties "^1.1.3" + has-symbols "^1.0.1" + object-keys "^1.1.1" object.entries@^1.0.4: version "1.1.0" @@ -10367,11 +10389,12 @@ yargs-parser@^13.1.0: decamelize "^1.2.0" yargs-parser@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" - integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo= + version "5.0.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.1.tgz#7ede329c1d8cdbbe209bd25cdb990e9b1ebbb394" + integrity sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA== dependencies: camelcase "^3.0.0" + object.assign "^4.1.0" yargs@12.0.5, yargs@^12.0.2: version "12.0.5" From 86239e0782ca8e4d50428bf245bd0c6568a9c894 Mon Sep 17 00:00:00 2001 From: Joh Dokler Date: Tue, 20 Apr 2021 10:29:31 +0200 Subject: [PATCH 2/9] Add missing PostgreSQL variables to the docker-compose.production.yml --- docker-compose.production.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker-compose.production.yml b/docker-compose.production.yml index e2cfe0579..1e98686d8 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -5,6 +5,11 @@ services: image: postgres:11 volumes: - scinote_production_postgres:/var/lib/postgresql/data + ports: + - "5432:5432" + environment: + - "POSTGRES_USER=postgres" + - "POSTGRES_PASSWORD=mysecretpassword" web: build: From 1383c0ce3ddf57cc7dd1b6d83e27de1c3cfce260 Mon Sep 17 00:00:00 2001 From: Joh Dokler Date: Wed, 21 Apr 2021 07:56:55 +0200 Subject: [PATCH 3/9] Fix DATABASE_URL in the Makefile production config generator --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ca8c2957e..cdc755f28 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ PAPERCLIP_HASH_SECRET=$(shell openssl rand -base64 128 | tr -d '\n') define PRODUCTION_CONFIG_BODY SECRET_KEY_BASE=$(shell openssl rand -hex 64) PAPERCLIP_HASH_SECRET=$(shell openssl rand -base64 128 | tr -d '\n') -DATABASE_URL=postgresql://postgres@db/scinote_production +DATABASE_URL=postgresql://postgres:mysecretpassword@db/scinote_production PAPERCLIP_STORAGE=filesystem ENABLE_RECAPTCHA=false ENABLE_USER_CONFIRMATION=false From 133c0fe196acabc149f4cf87c6db1ddf690c1851 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Apr 2021 21:11:42 +0000 Subject: [PATCH 4/9] Bump rexml from 3.2.4 to 3.2.5 Bumps [rexml](https://github.com/ruby/rexml) from 3.2.4 to 3.2.5. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.2.4...v3.2.5) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e984ecdd6..6f8e5892b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -496,7 +496,7 @@ GEM responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) - rexml (3.2.4) + rexml (3.2.5) rgl (0.5.7) lazy_priority_queue (~> 0.1.0) stream (~> 0.5.3) From c7d40047a1a91295f1858d905e206549d7bbbcab Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Wed, 5 May 2021 11:18:41 +0200 Subject: [PATCH 5/9] Fix file icons in export all [SCI-5685] --- app/helpers/file_icons_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/file_icons_helper.rb b/app/helpers/file_icons_helper.rb index d48941ccf..52fff0b59 100644 --- a/app/helpers/file_icons_helper.rb +++ b/app/helpers/file_icons_helper.rb @@ -48,7 +48,7 @@ module FileIconsHelper if image_link if report image_tag("data:image/svg+xml;base64,#{ - Base64.encode64(File.read('app/assets/images/' + image_link)) + Base64.encode64(File.read(Rails.root.join('app/assets/images/', image_link))) }", class: 'image-icon') else ActionController::Base.helpers.image_tag(image_link, class: 'image-icon') From 5409cad375f95321264027ffc16274388c759658 Mon Sep 17 00:00:00 2001 From: Miha Mencin Date: Thu, 6 May 2021 11:34:53 +0200 Subject: [PATCH 6/9] Bump version to 1.21.10 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index f124bfa15..ae7bbdf04 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.21.9 +1.21.10 From 0fbe45252fd3dfe4ee4443aaaae1b791d18746f3 Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Wed, 7 Jul 2021 14:57:35 +0200 Subject: [PATCH 7/9] Reset file_processing when new file is upladed [SCI-5870] --- app/models/asset.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/models/asset.rb b/app/models/asset.rb index 6dd6c63b7..71f65d9b4 100644 --- a/app/models/asset.rb +++ b/app/models/asset.rb @@ -57,6 +57,8 @@ class Asset < ApplicationRecord attr_accessor :file_content, :file_info, :in_template + before_save :reset_file_processing, if: -> { file.new_record? } + def self.search( user, include_archived, @@ -495,4 +497,8 @@ class Asset < ApplicationRecord end end end + + def reset_file_processing + self.file_processing = false + end end From 249b21808a71131857058a1f43cc99d0855cc9c5 Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Wed, 7 Jul 2021 11:34:28 +0200 Subject: [PATCH 8/9] Added pdf viewer js pack to my_module archive view [SCI-5870] --- app/views/my_modules/archive.html.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/views/my_modules/archive.html.erb b/app/views/my_modules/archive.html.erb index 12fcd357b..13539ba79 100644 --- a/app/views/my_modules/archive.html.erb +++ b/app/views/my_modules/archive.html.erb @@ -21,3 +21,6 @@ <% end %> + +<%= javascript_pack_tag 'pdfjs/pdf_js' %> +<%= stylesheet_pack_tag 'pdfjs/pdf_js_styles' %> From 6f245274be028ea0919d89bc7dd34ff216c4baaa Mon Sep 17 00:00:00 2001 From: miha Date: Tue, 13 Jul 2021 10:42:08 +0200 Subject: [PATCH 9/9] Bump version to 1.22.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 57807d6d0..6245beecd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.22.0 +1.22.1