Merge branch 'master' into webpack-v5

internetee · May 4, 2022 · 58bebc3 · 58bebc3
2 parents 40c9967 + 25d1eaa
commit 58bebc3
Show file tree

Hide file tree

Showing 8 changed files with 171 additions and 85 deletions.
diff --git a/.github/workflows/build_deploy_staging.yml b/.github/workflows/build_deploy_staging.yml
@@ -6,8 +6,6 @@ on:
     paths-ignore:
       - 'CHANGELOG.md'
       - 'README.md'
-      - 'yarn.lock'
-      - 'package.json'
     branches: [master]
     types:
       - opened
@@ -133,7 +131,7 @@ jobs:
           export KUBECONFIG=./kubeconfig
           helm repo add eisrepo https://internetee.github.io/helm-charts/
           helm repo update
-          helm upgrade --install auction-st-"$PR_REF" --set image.tag="$SHORT_TAG",reference="$PR_REF",scheduler.enabled="true" eisrepo/auction -n auction-staging
+          helm upgrade --install auction-st-"$PR_REF" --set image.tag="$SHORT_TAG",reference="$PR_REF",scheduler.enabled="true" eisrepo/auction -n auction
           helm upgrade --install auction-reg-api-"$PR_REF" --set nameOverride="reg-api-auction",image.repository="ghcr.io/internetee/auction_center",image.tag="REGISTRY_"$SHORT_TAG"",reference="$PR_REF" eisrepo/registry-api -n reg-api
           rm kubeconfig
           echo "server obs.tld.ee

diff --git a/.github/workflows/remove_st_after_pr.yml b/.github/workflows/remove_st_after_pr.yml
@@ -6,7 +6,6 @@ on:
     paths-ignore:
       - 'CHANGELOG.md'
       - 'README.md'
-      - 'yarn.lock'
 
 jobs:
   delete:
@@ -70,7 +69,7 @@ jobs:
           bash
           cd "$REPO"/"$PR_REF"
           export KUBECONFIG=./kubeconfig
-          helm delete auction-st-"$PR_REF" -n auction-staging
+          helm delete auction-st-"$PR_REF" -n auction
           helm delete auction-reg-api-"$PR_REF" -n reg-api
           rm kubeconfig
           echo "server obs.tld.ee

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -21,7 +21,7 @@ jobs:
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
     steps:
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
@@ -85,7 +85,7 @@ jobs:
       - name: Save coverage
         run: ./cc-test-reporter format-coverage --output coverage/codeclimate.${{ matrix.ruby }}.json
 
-      - uses: actions/upload-artifact@v2.3.0
+      - uses: actions/upload-artifact@v3.0.0
         with:
           name: coverage-${{ matrix.ruby }}
           path: coverage/codeclimate.${{ matrix.ruby }}.json
@@ -110,7 +110,7 @@ jobs:
       - name: Give test coverage reporter executable permissions
         run: chmod +x cc-test-reporter
 
-      - uses: actions/download-artifact@v2.1.0
+      - uses: actions/download-artifact@v3.0.0
         with:
           name: coverage-${{ matrix.ruby }}
           path: coverage

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.0.2
+3.1.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,36 @@
+13.04.2022
+* Update dependency css-what to v6 [#862](https://github.com/internetee/auction_center/pull/862)
+* Update dependency resolve-url-loader to v5 [#867](https://github.com/internetee/auction_center/pull/867)
+* Update actions/checkout action to v3 [#885](https://github.com/internetee/auction_center/pull/885)
+* Update actions/download-artifact action to v3 [#886](https://github.com/internetee/auction_center/pull/886)
+* Update actions/upload-artifact action to v3 [#887](https://github.com/internetee/auction_center/pull/887)
+* Update dependency highcharts to v10 [#888](https://github.com/internetee/auction_center/pull/888)
+* Bump puma to 5.6.4 [#891](https://github.com/internetee/auction_center/pull/891)
+* Update dependency ssri to v9 [#894](https://github.com/internetee/auction_center/pull/894)
+* Bump minimist to 1.2.6 [#895](https://github.com/internetee/auction_center/pull/895)
+* Bump nokogiri to 1.13.4 [#896](https://github.com/internetee/auction_center/pull/896)
+* Bump ansi-regex [#897](https://github.com/internetee/auction_center/pull/897)
+* Update dependency ruby to v3.1.2 [#898](https://github.com/internetee/auction_center/pull/898)
+
+12.02.2022
+* Update dependency puma to ~> 5.6.0 [#872](https://github.com/internetee/auction_center/pull/877)
+
+11.02.2022
+* Update dependency karma to v6.3.14 [#875](https://github.com/internetee/auction_center/pull/875)
+
+27.01.2022
+* Bump follow-redirects to 1.14.7 [#863](https://github.com/internetee/auction_center/pull/863)
+* Bump engine.io to 4.1.2 [#864](https://github.com/internetee/auction_center/pull/864)
+* Bump nanoid to 3.2.0 [#869](https://github.com/internetee/auction_center/pull/869)
+* Bump log4js to 6.4.1 [#872](https://github.com/internetee/auction_center/pull/872)
+
+17.01.2022
+* Update auction namespace [#865](https://github.com/internetee/auction_center/pull/865)
+* Remove elastic-APM gem [#866](https://github.com/internetee/auction_center/pull/866)
+
+16.12.2021
+* Update upload-artifact action to 2.3.1 [#860](https://github.com/internetee/auction_center/pull/860)
+
 25.11.2021
 * unsubscribe link to daily auction broadcast emails [#845](https://github.com/internetee/auction_center/issues/845)
 

diff --git a/Gemfile b/Gemfile
@@ -12,7 +12,6 @@ gem 'delayed_job'
 gem 'delayed_job_active_record'
 gem 'devise'
 gem 'directo', github: 'internetee/directo', branch: 'master'
-gem 'elastic-apm'
 gem 'jbuilder', '~> 2.11'
 gem 'kaminari'
 gem 'mimemagic', '~> 0.4.3'
@@ -22,7 +21,7 @@ gem 'omniauth-rails_csrf_protection'
 gem 'omniauth-tara', github: 'internetee/omniauth-tara'
 gem 'pdfkit'
 gem 'pg', '>= 0.18', '< 2.0'
-gem 'puma', '~> 5.5.0'
+gem 'puma', '~> 5.6.4'
 gem 'rails', '>= 6.0.3.5'
 gem 'rails-i18n'
 gem 'recaptcha'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -127,28 +127,12 @@ GEM
       responders
       warden (~> 1.2.3)
     docile (1.3.5)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    elastic-apm (4.3.0)
-      concurrent-ruby (~> 1.0)
-      http (>= 3.0)
     erubi (1.10.0)
     ffi (1.15.3)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
-      rake
     globalid (0.5.2)
       activesupport (>= 5.0)
     hashdiff (1.0.1)
     hashie (3.6.0)
-    http (5.0.1)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.2)
-      llhttp-ffi (~> 0.3.0)
-    http-cookie (1.0.4)
-      domain_name (~> 0.5)
-    http-form_data (2.3.0)
     httpclient (2.8.3)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
@@ -174,9 +158,6 @@ GEM
     listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    llhttp-ffi (0.3.1)
-      ffi-compiler (~> 1.0)
-      rake (~> 13.0)
     loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -188,14 +169,14 @@ GEM
       nokogiri (~> 1)
       rake
     mini_mime (1.1.1)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.8.0)
     minitest (5.14.4)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
     msgpack (1.4.2)
     nio4r (2.5.8)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.4)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     okcomputer (1.18.4)
     omniauth (1.9.0)
@@ -221,9 +202,9 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    puma (5.5.1)
+    puma (5.6.4)
       nio4r (~> 2.0)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-oauth2 (1.10.1)
       activesupport
@@ -366,7 +347,6 @@ DEPENDENCIES
   delayed_job_active_record
   devise
   directo!
-  elastic-apm
   jbuilder (~> 2.11)
   kaminari
   listen (>= 3.0.5, < 3.8)
@@ -378,7 +358,7 @@ DEPENDENCIES
   pdfkit
   pg (>= 0.18, < 2.0)
   pry
-  puma (~> 5.5.0)
+  puma (~> 5.6.4)
   rails (>= 6.0.3.5)
   rails-i18n
   recaptcha
@@ -394,4 +374,4 @@ DEPENDENCIES
   webpacker (~> 6.0.0.rc.5)
 
 BUNDLED WITH
-   2.1.4
+   2.3.5