Skip to content

Commit 7a25538

Browse files
rsmithlalrsmithlal
authored
Merge branch 'main' into improvement/conversation-actions-and-ui
Signed-off-by: Robert Smith <[email protected]>
2 parents ad41e19 + b81ef74 commit 7a25538

File tree

99 files changed

+3604
-1674
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+3604
-1674
lines changed

‎.github/workflows/rubyonrails.yml‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
matrix:
1212
include:
1313
- ruby: '3.4.4'
14-
rails: '7.1.5.1'
14+
rails: '7.1.5.2'
1515
allowed_failure: false # ✅ required
1616
- ruby: '3.4.4'
1717
rails: '7.2.2.1'
@@ -24,6 +24,7 @@ jobs:
2424
RAILS_ENV: test
2525
DATABASE_URL: "postgis://rails:password@localhost:5432/rails_test"
2626
ES_HOST: "http://localhost"
27+
ELASTICSEARCH_URL: "http://localhost:9200"
2728
RAILS_VERSION: ${{ matrix.rails }}
2829

2930
services:
@@ -54,15 +55,15 @@ jobs:
5455
# Run the automatic bundle-install only on 7.1.
5556
# For 7.2 / 8.0 it just sets up Ruby *and* restores a cache layer
5657
# that we’ll reuse in the later manual install.
57-
bundler-cache: ${{ matrix.rails == '7.1.5.1' }}
58+
bundler-cache: ${{ matrix.rails == '7.1.5.2' }}
5859

5960
# One cache bucket per Rails version so they don’t clobber each other.
6061
cache-version: rails-${{ matrix.rails }}
6162

6263
# Updating Rails can legitimately blow up on the experimental tracks,
6364
# so we allow that *step* to error out without failing the job.
6465
- name: Update Rails & install gems
65-
if: matrix.rails != '7.1.5.1'
66+
if: matrix.rails != '7.1.5.2'
6667
id: update
6768
run: |
6869
# turn off deployment mode
@@ -74,14 +75,20 @@ jobs:
7475
continue-on-error: ${{ matrix.allowed_failure }}
7576

7677
- name: Prepare DB schema
77-
if: (matrix.rails == '7.1.5.1') || steps.update.outcome == 'success'
78+
if: (matrix.rails == '7.1.5.2') || steps.update.outcome == 'success'
7879
run: |
7980
rm -f spec/dummy/tmp/pids/server.pid
8081
bundle exec rake -f spec/dummy/Rakefile db:schema:load
8182
continue-on-error: ${{ matrix.allowed_failure }}
8283

84+
- name: Wait for Elasticsearch
85+
if: (matrix.rails == '7.1.5.2') || steps.update.outcome == 'success'
86+
run: |
87+
echo "Waiting for Elasticsearch to be healthy..."
88+
curl -s "http://localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" || (echo "Elasticsearch not healthy" && exit 1)
89+
8390
- name: Run RSpec
84-
if: (matrix.rails == '7.1.5.1') || steps.update.outcome == 'success'
91+
if: (matrix.rails == '7.1.5.2') || steps.update.outcome == 'success'
8592
env:
8693
RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
8794
run: |
@@ -95,7 +102,7 @@ jobs:
95102
run: |
96103
COVERAGE=$(jq -r '.result.covered_percent' coverage/.last_run.json)
97104
COLOR=$(node -e "cov=parseFloat(process.argv[1]);console.log(cov>=90?'green':cov>=75?'orange':'red')" $COVERAGE)
98-
npx badgen-cli coverage ${COVERAGE}% -c $COLOR > coverage.svg
105+
npx badgen-cli --subject coverage --status ${COVERAGE}% --color $COLOR > coverage.svg
99106
100107
- name: Commit badge
101108
if: ${{ github.ref == 'refs/heads/main' && success() }}

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ gem 'pundit-resources', '~> 1.1.4', github: 'better-together-org/pundit-resource
2727

2828
# Core Rails gem
2929
gem 'rack-protection'
30-
gem 'rails', ENV.fetch('RAILS_VERSION', '7.1.5.1')
30+
gem 'rails', ENV.fetch('RAILS_VERSION', '7.1.5.2')
3131

3232
# Redis for ActionCable and background jobs
3333
gem 'redis', '~> 5.4'

‎Gemfile.lock‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -68,51 +68,51 @@ PATH
6868
GEM
6969
remote: https://rubygems.org/
7070
specs:
71-
actioncable (7.1.5.1)
72-
actionpack (= 7.1.5.1)
73-
activesupport (= 7.1.5.1)
71+
actioncable (7.1.5.2)
72+
actionpack (= 7.1.5.2)
73+
activesupport (= 7.1.5.2)
7474
nio4r (~> 2.0)
7575
websocket-driver (>= 0.6.1)
7676
zeitwerk (~> 2.6)
77-
actionmailbox (7.1.5.1)
78-
actionpack (= 7.1.5.1)
79-
activejob (= 7.1.5.1)
80-
activerecord (= 7.1.5.1)
81-
activestorage (= 7.1.5.1)
82-
activesupport (= 7.1.5.1)
77+
actionmailbox (7.1.5.2)
78+
actionpack (= 7.1.5.2)
79+
activejob (= 7.1.5.2)
80+
activerecord (= 7.1.5.2)
81+
activestorage (= 7.1.5.2)
82+
activesupport (= 7.1.5.2)
8383
mail (>= 2.7.1)
8484
net-imap
8585
net-pop
8686
net-smtp
87-
actionmailer (7.1.5.1)
88-
actionpack (= 7.1.5.1)
89-
actionview (= 7.1.5.1)
90-
activejob (= 7.1.5.1)
91-
activesupport (= 7.1.5.1)
87+
actionmailer (7.1.5.2)
88+
actionpack (= 7.1.5.2)
89+
actionview (= 7.1.5.2)
90+
activejob (= 7.1.5.2)
91+
activesupport (= 7.1.5.2)
9292
mail (~> 2.5, >= 2.5.4)
9393
net-imap
9494
net-pop
9595
net-smtp
9696
rails-dom-testing (~> 2.2)
97-
actionpack (7.1.5.1)
98-
actionview (= 7.1.5.1)
99-
activesupport (= 7.1.5.1)
97+
actionpack (7.1.5.2)
98+
actionview (= 7.1.5.2)
99+
activesupport (= 7.1.5.2)
100100
nokogiri (>= 1.8.5)
101101
racc
102102
rack (>= 2.2.4)
103103
rack-session (>= 1.0.1)
104104
rack-test (>= 0.6.3)
105105
rails-dom-testing (~> 2.2)
106106
rails-html-sanitizer (~> 1.6)
107-
actiontext (7.1.5.1)
108-
actionpack (= 7.1.5.1)
109-
activerecord (= 7.1.5.1)
110-
activestorage (= 7.1.5.1)
111-
activesupport (= 7.1.5.1)
107+
actiontext (7.1.5.2)
108+
actionpack (= 7.1.5.2)
109+
activerecord (= 7.1.5.2)
110+
activestorage (= 7.1.5.2)
111+
activesupport (= 7.1.5.2)
112112
globalid (>= 0.6.0)
113113
nokogiri (>= 1.8.5)
114-
actionview (7.1.5.1)
115-
activesupport (= 7.1.5.1)
114+
actionview (7.1.5.2)
115+
activesupport (= 7.1.5.2)
116116
builder (~> 3.1)
117117
erubi (~> 1.11)
118118
rails-dom-testing (~> 2.2)
@@ -125,27 +125,27 @@ GEM
125125
activestorage (>= 6.1.4)
126126
activesupport (>= 6.1.4)
127127
marcel (>= 1.0.3)
128-
activejob (7.1.5.1)
129-
activesupport (= 7.1.5.1)
128+
activejob (7.1.5.2)
129+
activesupport (= 7.1.5.2)
130130
globalid (>= 0.3.6)
131-
activemodel (7.1.5.1)
132-
activesupport (= 7.1.5.1)
133-
activerecord (7.1.5.1)
134-
activemodel (= 7.1.5.1)
135-
activesupport (= 7.1.5.1)
131+
activemodel (7.1.5.2)
132+
activesupport (= 7.1.5.2)
133+
activerecord (7.1.5.2)
134+
activemodel (= 7.1.5.2)
135+
activesupport (= 7.1.5.2)
136136
timeout (>= 0.4.0)
137137
activerecord-import (2.2.0)
138138
activerecord (>= 4.2)
139139
activerecord-postgis-adapter (9.0.2)
140140
activerecord (~> 7.1.0)
141141
rgeo-activerecord (~> 7.0.0)
142-
activestorage (7.1.5.1)
143-
actionpack (= 7.1.5.1)
144-
activejob (= 7.1.5.1)
145-
activerecord (= 7.1.5.1)
146-
activesupport (= 7.1.5.1)
142+
activestorage (7.1.5.2)
143+
actionpack (= 7.1.5.2)
144+
activejob (= 7.1.5.2)
145+
activerecord (= 7.1.5.2)
146+
activesupport (= 7.1.5.2)
147147
marcel (~> 1.0)
148-
activesupport (7.1.5.1)
148+
activesupport (7.1.5.2)
149149
base64
150150
benchmark (>= 0.3)
151151
bigdecimal
@@ -548,20 +548,20 @@ GEM
548548
rack (>= 1.3)
549549
rackup (2.2.1)
550550
rack (>= 3)
551-
rails (7.1.5.1)
552-
actioncable (= 7.1.5.1)
553-
actionmailbox (= 7.1.5.1)
554-
actionmailer (= 7.1.5.1)
555-
actionpack (= 7.1.5.1)
556-
actiontext (= 7.1.5.1)
557-
actionview (= 7.1.5.1)
558-
activejob (= 7.1.5.1)
559-
activemodel (= 7.1.5.1)
560-
activerecord (= 7.1.5.1)
561-
activestorage (= 7.1.5.1)
562-
activesupport (= 7.1.5.1)
551+
rails (7.1.5.2)
552+
actioncable (= 7.1.5.2)
553+
actionmailbox (= 7.1.5.2)
554+
actionmailer (= 7.1.5.2)
555+
actionpack (= 7.1.5.2)
556+
actiontext (= 7.1.5.2)
557+
actionview (= 7.1.5.2)
558+
activejob (= 7.1.5.2)
559+
activemodel (= 7.1.5.2)
560+
activerecord (= 7.1.5.2)
561+
activestorage (= 7.1.5.2)
562+
activesupport (= 7.1.5.2)
563563
bundler (>= 1.15.0)
564-
railties (= 7.1.5.1)
564+
railties (= 7.1.5.2)
565565
rails-dom-testing (2.3.0)
566566
activesupport (>= 5.0.0)
567567
minitest
@@ -572,9 +572,9 @@ GEM
572572
rails-i18n (7.0.10)
573573
i18n (>= 0.7, < 2)
574574
railties (>= 6.0.0, < 8)
575-
railties (7.1.5.1)
576-
actionpack (= 7.1.5.1)
577-
activesupport (= 7.1.5.1)
575+
railties (7.1.5.2)
576+
actionpack (= 7.1.5.2)
577+
activesupport (= 7.1.5.2)
578578
irb
579579
rackup (>= 1.0.0)
580580
rake (>= 12.2)
@@ -678,7 +678,7 @@ GEM
678678
rubocop-factory_bot (2.27.1)
679679
lint_roller (~> 1.1)
680680
rubocop (~> 1.72, >= 1.72.1)
681-
rubocop-rails (2.33.0)
681+
rubocop-rails (2.33.1)
682682
activesupport (>= 4.2.0)
683683
lint_roller (~> 1.1)
684684
rack (>= 1.1)
@@ -699,7 +699,7 @@ GEM
699699
ruby-vips (2.2.3)
700700
ffi (~> 1.12)
701701
logger
702-
rubyzip (2.4.1)
702+
rubyzip (3.0.1)
703703
sass-embedded (1.86.3-aarch64-linux-gnu)
704704
google-protobuf (~> 4.30)
705705
sass-embedded (1.86.3-arm64-darwin)
@@ -711,11 +711,11 @@ GEM
711711
sassc-embedded (1.80.4)
712712
sass-embedded (~> 1.80)
713713
securerandom (0.4.1)
714-
selenium-webdriver (4.34.0)
714+
selenium-webdriver (4.35.0)
715715
base64 (~> 0.2)
716716
logger (~> 1.4)
717717
rexml (~> 3.2, >= 3.2.5)
718-
rubyzip (>= 1.2.2, < 3.0)
718+
rubyzip (>= 1.2.2, < 4.0)
719719
websocket (~> 1.0)
720720
sentry-rails (5.26.0)
721721
railties (>= 5.0)
@@ -845,7 +845,7 @@ DEPENDENCIES
845845
pundit-resources (~> 1.1.4)!
846846
rack-mini-profiler
847847
rack-protection
848-
rails (= 7.1.5.1)
848+
rails (= 7.1.5.2)
849849
rb-readline
850850
rbtrace
851851
redis (~> 5.4)

‎app/assets/stylesheets/better_together/application.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
}
7373

7474
#flash_messages {
75-
position: absolute;
75+
position: fixed;
7676
width: 100vw;
7777
top: 6vh;
7878
z-index: 1001;

‎app/controllers/better_together/calendars_controller.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def edit; end
2020
# if @calendar.save
2121
# redirect_to @calendar, notice: "Calendar was successfully created."
2222
# else
23-
# render :new, status: :unprocessable_entity
23+
# render :new, status: :unprocessable_content
2424
# end
2525
# end
2626

@@ -29,7 +29,7 @@ def edit; end
2929
# if @calendar.update(better_together_calendar_params)
3030
# redirect_to @calendar, notice: "Calendar was successfully updated.", status: :see_other
3131
# else
32-
# render :edit, status: :unprocessable_entity
32+
# render :edit, status: :unprocessable_content
3333
# end
3434
# end
3535

‎app/controllers/better_together/communities_controller.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
3838
end
3939
else
4040
flash.now[:alert] = t('community.create_failed')
41-
format.html { render :edit, status: :unprocessable_entity }
41+
format.html { render :edit, status: :unprocessable_content }
4242
format.turbo_stream do
4343
render turbo_stream: [
4444
turbo_stream.update('form_errors', partial: 'layouts/better_together/errors',
@@ -62,7 +62,7 @@ def update # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
6262
end
6363
else
6464
flash.now[:alert] = t('community.update_failed')
65-
format.html { render :new, status: :unprocessable_entity }
65+
format.html { render :new, status: :unprocessable_content }
6666
format.turbo_stream do
6767
render turbo_stream: [
6868
turbo_stream.update('form_errors', partial: 'layouts/better_together/errors',

‎app/controllers/better_together/geography/continents_controller.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def create # rubocop:todo Metrics/MethodLength
3636
locals: { object: @geography_continent }
3737
)
3838
end
39-
format.html { render :new, status: :unprocessable_entity }
39+
format.html { render :new, status: :unprocessable_content }
4040
end
4141
end
4242
end
@@ -54,7 +54,7 @@ def update # rubocop:todo Metrics/MethodLength
5454
locals: { object: @geography_continent }
5555
)
5656
end
57-
format.html { render :edit, status: :unprocessable_entity }
57+
format.html { render :edit, status: :unprocessable_content }
5858
end
5959
end
6060
end

‎app/controllers/better_together/geography/countries_controller.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def create # rubocop:todo Metrics/MethodLength
4343
locals: { object: @geography_country }
4444
)
4545
end
46-
format.html { render :new, status: :unprocessable_entity }
46+
format.html { render :new, status: :unprocessable_content }
4747
end
4848
end
4949
end
@@ -61,7 +61,7 @@ def update # rubocop:todo Metrics/MethodLength
6161
locals: { object: @geography_country }
6262
)
6363
end
64-
format.html { render :edit, status: :unprocessable_entity }
64+
format.html { render :edit, status: :unprocessable_content }
6565
end
6666
end
6767
end

‎app/controllers/better_together/geography/region_settlements_controller.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def create # rubocop:todo Metrics/MethodLength
3636
locals: { object: @geography_region_settlement }
3737
)
3838
end
39-
format.html { render :new, status: :unprocessable_entity }
39+
format.html { render :new, status: :unprocessable_content }
4040
end
4141
end
4242
end
@@ -55,7 +55,7 @@ def update # rubocop:todo Metrics/MethodLength
5555
locals: { object: @geography_region_settlement }
5656
)
5757
end
58-
format.html { render :edit, status: :unprocessable_entity }
58+
format.html { render :edit, status: :unprocessable_content }
5959
end
6060
end
6161
end

‎app/controllers/better_together/geography/regions_controller.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def create # rubocop:todo Metrics/MethodLength
4343
locals: { object: @geography_region }
4444
)
4545
end
46-
format.html { render :new, status: :unprocessable_entity }
46+
format.html { render :new, status: :unprocessable_content }
4747
end
4848
end
4949
end
@@ -61,7 +61,7 @@ def update # rubocop:todo Metrics/MethodLength
6161
locals: { object: @geography_region }
6262
)
6363
end
64-
format.html { render :edit, status: :unprocessable_entity }
64+
format.html { render :edit, status: :unprocessable_content }
6565
end
6666
end
6767
end

0 commit comments

Comments
 (0)