Skip to content

Commit

Permalink
Merge tag '6.9.10-rc'
Browse files Browse the repository at this point in the history
2023 Q4 release
  • Loading branch information
Agnieszka Figiel committed Nov 20, 2023
2 parents 53aeb4e + fac96a4 commit 6818870
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 93 deletions.
71 changes: 3 additions & 68 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,75 +3,10 @@ updates:
- package-ecosystem: bundler
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
interval: weekly
ignore:
- dependency-name: ckeditor
versions:
- ">= 5.a, < 6"
- dependency-name: json-schema
versions:
- "> 2.8.0, < 2.9"
- dependency-name: rack
versions:
- ">= 2.1.a, < 2.2"
- dependency-name: sprockets
versions:
- ">= 4.a, < 5"
- dependency-name: sidekiq-unique-jobs
versions:
- 7.0.4
- 7.0.5
- 7.0.7
- 7.0.8
- dependency-name: oj
versions:
- 3.11.3
- 3.11.4
- dependency-name: aws-sdk-s3
versions:
- 1.88.1
- 1.88.2
- 1.89.0
- 1.90.0
- 1.91.0
- 1.92.0
- 1.93.0
- 1.93.1
- dependency-name: rubocop
versions:
- 1.12.1
- 1.9.0
- 1.9.1
- dependency-name: rubocop-performance
versions:
- 1.10.2
- dependency-name: bootsnap
versions:
- 1.7.2
- 1.7.3
- dependency-name: listen
versions:
- 3.4.1
- 3.5.0
- dependency-name: appsignal
versions:
- 2.11.9
- 3.0.0
- 3.0.1
- dependency-name: webmock
versions:
- 3.11.1
- 3.11.3
- 3.12.0
- 3.12.1
- dependency-name: rails
versions:
- 5.2.4.5
- dependency-name: puma
versions:
- 5.2.0
- dependency-name: "*"
update-types: ["version-update:semver-patch", "version-update:semver-minor"]
- package-ecosystem: github-actions
directory: "/"
schedule:
Expand Down
48 changes: 24 additions & 24 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ GEM
kaminari (~> 1.0, >= 1.2.1)
railties (>= 6.1, < 7.1)
ransack (>= 2.1.1, < 4)
activeadmin_addons (1.10.0)
activeadmin_addons (1.10.1)
active_material
railties
redcarpet
Expand Down Expand Up @@ -103,12 +103,12 @@ GEM
activerecord (>= 4.2)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
airbrussh (1.4.1)
airbrussh (1.5.0)
sshkit (>= 1.6.1, != 1.7.0)
annotate (3.2.0)
activerecord (>= 3.2, < 8.0)
rake (>= 10.4, < 14.0)
appsignal (3.4.13)
appsignal (3.4.14)
rack
arbre (1.5.0)
activesupport (>= 3.0.0, < 7.1)
Expand All @@ -131,17 +131,17 @@ GEM
aws-sigv4 (1.6.0)
aws-eventstream (~> 1, >= 1.0.2)
base64 (0.1.1)
bcrypt (3.1.18)
bcrypt (3.1.19)
bcrypt_pbkdf (1.1.0)
bootsnap (1.16.0)
bootsnap (1.17.0)
msgpack (~> 1.2)
brpoplpush-redis_script (0.1.3)
concurrent-ruby (~> 1.0, >= 1.0.5)
redis (>= 1.0, < 6)
buftok (0.3.0)
builder (3.2.4)
byebug (11.1.3)
capistrano (3.17.3)
capistrano (3.18.0)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
Expand Down Expand Up @@ -185,8 +185,8 @@ GEM
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
date (3.3.3)
devise (4.9.2)
date (3.3.4)
devise (4.9.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
Expand Down Expand Up @@ -253,7 +253,7 @@ GEM
railties (>= 5.2, < 7.1)
responders (>= 2, < 4)
jmespath (1.6.2)
jquery-rails (4.5.1)
jquery-rails (4.6.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
Expand All @@ -273,7 +273,7 @@ GEM
activerecord
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
kt-paperclip (7.2.0)
kt-paperclip (7.2.1)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
marcel (~> 1.0.1)
Expand All @@ -287,7 +287,7 @@ GEM
llhttp-ffi (0.4.0)
ffi-compiler (~> 1.0)
rake (~> 13.0)
loofah (2.21.4)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
Expand All @@ -299,27 +299,27 @@ GEM
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
method_source (1.0.0)
mime-types (3.4.1)
mime-types (3.5.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0218.1)
mime-types-data (3.2023.1003)
mini_mime (1.1.5)
mini_portile2 (2.8.4)
mini_portile2 (2.8.5)
minitest (5.20.0)
msgpack (1.6.0)
msgpack (1.7.2)
multipart-post (2.3.0)
naught (1.1.0)
net-imap (0.4.0)
net-imap (0.4.5)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
net-protocol (0.2.2)
timeout
net-scp (4.0.0)
net-ssh (>= 2.6.5, < 8.0.0)
net-smtp (0.4.0)
net-protocol
net-ssh (7.1.0)
net-ssh (7.2.0)
nio4r (2.5.9)
nokogiri (1.15.4)
mini_portile2 (~> 2.8.2)
Expand Down Expand Up @@ -380,7 +380,7 @@ GEM
rake (>= 12.2)
thor (~> 1.0)
rainbow (3.1.1)
rake (13.0.6)
rake (13.1.0)
ransack (3.2.1)
activerecord (>= 6.1.5)
activesupport (>= 6.1.5)
Expand All @@ -392,7 +392,7 @@ GEM
redis (4.8.1)
regexp_parser (2.8.2)
require_all (3.0.0)
responders (3.1.0)
responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
rexml (3.2.6)
Expand Down Expand Up @@ -452,7 +452,7 @@ GEM
connection_pool (>= 2.2.5, < 3)
rack (~> 2.0)
redis (>= 4.5.0, < 5)
sidekiq-unique-jobs (7.1.30)
sidekiq-unique-jobs (7.1.31)
brpoplpush-redis_script (> 0.1.1, <= 2.0.0)
concurrent-ruby (~> 1.0, >= 1.0.5)
redis (< 5.0)
Expand Down Expand Up @@ -497,10 +497,10 @@ GEM
rubocop-performance (~> 1.19.1)
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
thor (1.2.2)
thor (1.3.0)
thread_safe (0.3.6)
tilt (2.1.0)
timeout (0.4.0)
tilt (2.3.0)
timeout (0.4.1)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
Expand Down
2 changes: 1 addition & 1 deletion config/deploy.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# config valid for current version and patch releases of Capistrano
lock '~> 3.17.0'
lock '~> 3.18.0'

set :application, 'trase'
set :repo_url, 'git@github.com:Vizzuality/trase.git'
Expand Down

0 comments on commit 6818870

Please sign in to comment.