Skip to content

Commit f104c56

Browse files
jserafmattbaumann1
andauthored
Release/1.19 (#1027)
* update readme about Shibboleth. #517 * PR comments changes. #517 * Update README.md updated typo. #517 * Refactor GrantPermissions front-end and Add contact attribute to grant admins (#982) * Add contact to grant_permission, grant * Add :contact trait to grant permission factory * Add contact info to Grant show page * Include contacts in Grant find * Move role descriptions to select options * Add :contact to permitted params * Tweaks to grant permission form display * Include contact info on submission page * Update to latest version of turbo-rails * Move On/Off boolean string translations to I18n, add Yes/No translation * Make grant permission editing inline via turbo * continue Make grant permission editing inline via turbo * Tweak css on contact card * Add tom-select for type to select * Import, override tom-select css * Add tom-select stimulus controller * Switch to tom-select in new permission form * Use turbo for all grant permission actions * Task/fix permission turbo actions (#991) * Use turbo update to clear the new_permission frame * Add new permission alphabetically based on last name * CSS fixes for proper row striping on turbo updates * Task/remove decorators (#993) * Remove empty, auto-generated decorators and specs * Remove all decorators and related specs * Add helper to get a CSS class based on grant name length * Remove all things decorator from index * Put all mailers in their own app/views directory (#997) * Task/searchable homepage (#995) * Use stimulus for filtering open grants on homepage * Add basic filtering specs * Quick fix for datepicker error in Firefox (#996) * Task/add submission award tracking (#1002) * Fix typo in partial name * Make a generic stylesheet for tables containing turbo_streams * Update permission table to use turbo-table stylesheet * User turbo-table stylesheet and minimize role-related calls in Submissions index * Update Submissions index spec to account for turbo-table styles * WIP: add awarded to submission, use in submissions index page * WIP: Add optional awarded column to excel view * WIP: update turbo-rails, hotwire * Add system specs for awarding submission, clean up or clarify other specs * Move submission row to partial, fix css striping * Use shared tests for roles that can un-/award * WIP: include RecordIdentifier in rails_helper to use dom_id method in system specs * Use turbo-table style, include award checkbox/form for appropriate admins * Add specs to confirm who can view awarded form * Misc partial cleanup, add notice to grant admins about who can view award form/column * Move export to dedicated controller, limit exported file name length * Add sorts on Award columns (#1004) * Update version number and release notes (#1007) * platform and nokogiri updates (#1011) * Update to rails 6.1.7 (#1012) * Task/example file and readme edits (#1013) * Remove attribute-map.yml from symlinked file list * Update rails version, clarify text, minor formatting * task/disable review form edits after completed reviews (#1015) * Disallow criteria update when grant has completed reviews * Clarify disabled/editable form status variable name * Misc formatting, typo correction, and spec improvement * Task/fix review criteria show alignment (#1018) * Add shared partial to display review scores/comments on submission admin/panel pages * Add No Score abbreviation tag helper * Use new review score/comment partial in admin submission review index pages * Tweak line-height css in table headers * Task/fix reviews pdf layout (#1020) * Fix grid layout problem in PDFs * Pluralize Applicant text as needed * Add applicant to submissions created in spec * Pause for page generation to fix periodically broken specs * Task/pdf css layout issues (#1021) * Fix PDF CSS layout (again) * Add pluralizer helper for Applicant label * Fix/refactor intermittently failing specs * Task/add submission state enum (#1024) * WIP: add migration * WIP: add review_states to model * WIP: add state traits to review factory * WIP: update specs * WIP: Add state to review controller and form submit button * WIP: update legacy `is_complete?` method to use enum * WIP: limit submission score calculations to submitted reviews * WIP: Add translation for review states * WIP: include 'draft' status in messages related to reviews * WIP: Add save draft button to review form * WIP: add required_criteria scope * WIP: add helper for review scores to appropriately display scores in index views. * Fix scores field_with_error issue, move score clear js to stimulus, fix draft/submission error aggregation/display * Add comments to view partials to clarify behavior * Formatting fixes * Fix error enumeration deprecation warning * Only include scores from submitted reviews on admin grant/submission/reviews display * Only include score/comment for submitted reviews in xlsx file * WIP: misc clarification, formatting, typo fixes * Update version and release notes * Fix duplicate errors/criteria on assigned->submitted review. Misc spec fixes * Add i18n entries for score labels * Add method to remove redundant error on parent in favor of individual criteria_review errors --------- Co-authored-by: mattbaumann1 <mattbaumann1@users.noreply.github.com> Co-authored-by: Matthew Baumann <matthew.baumann@northwestern.edu>
1 parent fd5bdcd commit f104c56

File tree

80 files changed

+1467
-964
lines changed

Some content is hidden

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

80 files changed

+1467
-964
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
44
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55

66
gem 'pg'
7-
gem 'rails', '6.1.5'
7+
gem 'rails', '6.1.7.6'
88

99
# Use SCSS for stylesheets
1010
gem 'sass-rails', '>= 5'

Gemfile.lock

Lines changed: 93 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -18,64 +18,64 @@ GIT
1818
GEM
1919
remote: https://rubygems.org/
2020
specs:
21-
actioncable (6.1.5)
22-
actionpack (= 6.1.5)
23-
activesupport (= 6.1.5)
21+
actioncable (6.1.7.6)
22+
actionpack (= 6.1.7.6)
23+
activesupport (= 6.1.7.6)
2424
nio4r (~> 2.0)
2525
websocket-driver (>= 0.6.1)
26-
actionmailbox (6.1.5)
27-
actionpack (= 6.1.5)
28-
activejob (= 6.1.5)
29-
activerecord (= 6.1.5)
30-
activestorage (= 6.1.5)
31-
activesupport (= 6.1.5)
26+
actionmailbox (6.1.7.6)
27+
actionpack (= 6.1.7.6)
28+
activejob (= 6.1.7.6)
29+
activerecord (= 6.1.7.6)
30+
activestorage (= 6.1.7.6)
31+
activesupport (= 6.1.7.6)
3232
mail (>= 2.7.1)
33-
actionmailer (6.1.5)
34-
actionpack (= 6.1.5)
35-
actionview (= 6.1.5)
36-
activejob (= 6.1.5)
37-
activesupport (= 6.1.5)
33+
actionmailer (6.1.7.6)
34+
actionpack (= 6.1.7.6)
35+
actionview (= 6.1.7.6)
36+
activejob (= 6.1.7.6)
37+
activesupport (= 6.1.7.6)
3838
mail (~> 2.5, >= 2.5.4)
3939
rails-dom-testing (~> 2.0)
40-
actionpack (6.1.5)
41-
actionview (= 6.1.5)
42-
activesupport (= 6.1.5)
40+
actionpack (6.1.7.6)
41+
actionview (= 6.1.7.6)
42+
activesupport (= 6.1.7.6)
4343
rack (~> 2.0, >= 2.0.9)
4444
rack-test (>= 0.6.3)
4545
rails-dom-testing (~> 2.0)
4646
rails-html-sanitizer (~> 1.0, >= 1.2.0)
47-
actiontext (6.1.5)
48-
actionpack (= 6.1.5)
49-
activerecord (= 6.1.5)
50-
activestorage (= 6.1.5)
51-
activesupport (= 6.1.5)
47+
actiontext (6.1.7.6)
48+
actionpack (= 6.1.7.6)
49+
activerecord (= 6.1.7.6)
50+
activestorage (= 6.1.7.6)
51+
activesupport (= 6.1.7.6)
5252
nokogiri (>= 1.8.5)
53-
actionview (6.1.5)
54-
activesupport (= 6.1.5)
53+
actionview (6.1.7.6)
54+
activesupport (= 6.1.7.6)
5555
builder (~> 3.1)
5656
erubi (~> 1.4)
5757
rails-dom-testing (~> 2.0)
5858
rails-html-sanitizer (~> 1.1, >= 1.2.0)
59-
activejob (6.1.5)
60-
activesupport (= 6.1.5)
59+
activejob (6.1.7.6)
60+
activesupport (= 6.1.7.6)
6161
globalid (>= 0.3.6)
62-
activemodel (6.1.5)
63-
activesupport (= 6.1.5)
62+
activemodel (6.1.7.6)
63+
activesupport (= 6.1.7.6)
6464
activemodel-serializers-xml (1.0.2)
6565
activemodel (> 5.x)
6666
activesupport (> 5.x)
6767
builder (~> 3.1)
68-
activerecord (6.1.5)
69-
activemodel (= 6.1.5)
70-
activesupport (= 6.1.5)
71-
activestorage (6.1.5)
72-
actionpack (= 6.1.5)
73-
activejob (= 6.1.5)
74-
activerecord (= 6.1.5)
75-
activesupport (= 6.1.5)
68+
activerecord (6.1.7.6)
69+
activemodel (= 6.1.7.6)
70+
activesupport (= 6.1.7.6)
71+
activestorage (6.1.7.6)
72+
actionpack (= 6.1.7.6)
73+
activejob (= 6.1.7.6)
74+
activerecord (= 6.1.7.6)
75+
activesupport (= 6.1.7.6)
7676
marcel (~> 1.0)
7777
mini_mime (>= 1.1.0)
78-
activesupport (6.1.5)
78+
activesupport (6.1.7.6)
7979
concurrent-ruby (~> 1.0, >= 1.0.2)
8080
i18n (>= 1.6, < 2)
8181
minitest (>= 5.1)
@@ -166,6 +166,7 @@ GEM
166166
coderay (1.1.3)
167167
concurrent-ruby (1.2.2)
168168
crass (1.0.6)
169+
date (3.3.3)
169170
debug_inspector (1.1.0)
170171
devise (4.8.1)
171172
bcrypt (~> 3.0)
@@ -229,7 +230,7 @@ GEM
229230
nokogiri (>= 1.6.0)
230231
ruby_parser (~> 3.5)
231232
htmlentities (4.3.4)
232-
i18n (1.12.0)
233+
i18n (1.14.1)
233234
concurrent-ruby (~> 1.0)
234235
i18n-debug (1.2.0)
235236
i18n (< 2)
@@ -248,25 +249,39 @@ GEM
248249
listen (3.5.1)
249250
rb-fsevent (~> 0.10, >= 0.10.3)
250251
rb-inotify (~> 0.9, >= 0.9.10)
251-
loofah (2.19.1)
252+
loofah (2.21.3)
252253
crass (~> 1.0.2)
253-
nokogiri (>= 1.5.9)
254-
mail (2.7.1)
254+
nokogiri (>= 1.12.0)
255+
mail (2.8.1)
255256
mini_mime (>= 0.1.1)
257+
net-imap
258+
net-pop
259+
net-smtp
256260
marcel (1.0.2)
257261
matrix (0.4.2)
258262
method_source (1.0.0)
259-
mini_mime (1.1.2)
260-
minitest (5.18.0)
263+
mini_mime (1.1.5)
264+
minitest (5.19.0)
261265
msgpack (1.5.1)
262266
nested_form (0.3.2)
267+
net-imap (0.3.7)
268+
date
269+
net-protocol
270+
net-pop (0.1.2)
271+
net-protocol
272+
net-protocol (0.2.1)
273+
timeout
263274
net-scp (3.0.0)
264275
net-ssh (>= 2.6.5, < 7.0.0)
276+
net-smtp (0.3.3)
277+
net-protocol
265278
net-ssh (6.1.0)
266-
nio4r (2.5.8)
267-
nokogiri (1.14.2-x86_64-darwin)
279+
nio4r (2.5.9)
280+
nokogiri (1.15.4-arm64-darwin)
268281
racc (~> 1.4)
269-
nokogiri (1.14.2-x86_64-linux)
282+
nokogiri (1.15.4-x86_64-darwin)
283+
racc (~> 1.4)
284+
nokogiri (1.15.4-x86_64-linux)
270285
racc (~> 1.4)
271286
orm_adapter (0.5.0)
272287
pagy (4.10.2)
@@ -284,37 +299,39 @@ GEM
284299
activesupport (>= 3.0.0)
285300
pundit-matchers (1.6.0)
286301
rspec-rails (>= 3.0.0)
287-
racc (1.6.2)
288-
rack (2.2.6.4)
302+
racc (1.7.1)
303+
rack (2.2.8)
289304
rack-test (2.1.0)
290305
rack (>= 1.3)
291-
rails (6.1.5)
292-
actioncable (= 6.1.5)
293-
actionmailbox (= 6.1.5)
294-
actionmailer (= 6.1.5)
295-
actionpack (= 6.1.5)
296-
actiontext (= 6.1.5)
297-
actionview (= 6.1.5)
298-
activejob (= 6.1.5)
299-
activemodel (= 6.1.5)
300-
activerecord (= 6.1.5)
301-
activestorage (= 6.1.5)
302-
activesupport (= 6.1.5)
306+
rails (6.1.7.6)
307+
actioncable (= 6.1.7.6)
308+
actionmailbox (= 6.1.7.6)
309+
actionmailer (= 6.1.7.6)
310+
actionpack (= 6.1.7.6)
311+
actiontext (= 6.1.7.6)
312+
actionview (= 6.1.7.6)
313+
activejob (= 6.1.7.6)
314+
activemodel (= 6.1.7.6)
315+
activerecord (= 6.1.7.6)
316+
activestorage (= 6.1.7.6)
317+
activesupport (= 6.1.7.6)
303318
bundler (>= 1.15.0)
304-
railties (= 6.1.5)
319+
railties (= 6.1.7.6)
305320
sprockets-rails (>= 2.0.0)
306321
rails-controller-testing (1.0.5)
307322
actionpack (>= 5.0.1.rc1)
308323
actionview (>= 5.0.1.rc1)
309324
activesupport (>= 5.0.1.rc1)
310-
rails-dom-testing (2.0.3)
311-
activesupport (>= 4.2.0)
325+
rails-dom-testing (2.2.0)
326+
activesupport (>= 5.0.0)
327+
minitest
312328
nokogiri (>= 1.6)
313-
rails-html-sanitizer (1.5.0)
314-
loofah (~> 2.19, >= 2.19.1)
315-
railties (6.1.5)
316-
actionpack (= 6.1.5)
317-
activesupport (= 6.1.5)
329+
rails-html-sanitizer (1.6.0)
330+
loofah (~> 2.21)
331+
nokogiri (~> 1.14)
332+
railties (6.1.7.6)
333+
actionpack (= 6.1.7.6)
334+
activesupport (= 6.1.7.6)
318335
method_source
319336
rake (>= 12.2)
320337
thor (~> 1.0)
@@ -403,9 +420,9 @@ GEM
403420
spring-watcher-listen (2.0.1)
404421
listen (>= 2.7, < 4.0)
405422
spring (>= 1.2, < 3.0)
406-
sprockets (4.1.1)
423+
sprockets (4.2.0)
407424
concurrent-ruby (~> 1.0)
408-
rack (> 1, < 3)
425+
rack (>= 2.2.4, < 4)
409426
sprockets-es6 (0.9.2)
410427
babel-source (>= 5.8.11)
411428
babel-transpiler
@@ -422,9 +439,10 @@ GEM
422439
temple (0.8.2)
423440
terser (1.1.11)
424441
execjs (>= 0.3.0, < 3)
425-
thor (1.2.1)
442+
thor (1.2.2)
426443
tilt (2.0.10)
427444
timeliness (0.4.4)
445+
timeout (0.4.0)
428446
trix (0.10.1)
429447
rails
430448
turbo-rails (1.4.0)
@@ -445,17 +463,18 @@ GEM
445463
bindex (>= 0.4.0)
446464
railties (>= 6.0.0)
447465
webrick (1.7.0)
448-
websocket-driver (0.7.5)
466+
websocket-driver (0.7.6)
449467
websocket-extensions (>= 0.1.0)
450468
websocket-extensions (0.1.5)
451469
wicked_pdf (2.1.0)
452470
activesupport
453471
wkhtmltopdf-binary (0.12.6.5)
454472
xpath (3.2.0)
455473
nokogiri (~> 1.8)
456-
zeitwerk (2.6.7)
474+
zeitwerk (2.6.11)
457475

458476
PLATFORMS
477+
arm64-darwin-22
459478
x86_64-darwin-18
460479
x86_64-darwin-20
461480
x86_64-linux
@@ -506,7 +525,7 @@ DEPENDENCIES
506525
puma (~> 4.3.12)
507526
pundit
508527
pundit-matchers (~> 1.6.0)
509-
rails (= 6.1.5)
528+
rails (= 6.1.7.6)
510529
rails-controller-testing
511530
ransack!
512531
redis (~> 4.0)

README.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ The following are required to install competitions:
1414
* Mailcatcher(https://mailcatcher.me) is used in the development environment for emails.
1515
* Postgres database
1616
* RVM installed on the server
17-
# Yarn installed on the server
17+
* Yarn installed on the server
1818
* Capistrano for deployment
1919

2020

2121
# Compatibility
2222

2323
* Ruby: 3.0.2
24-
* Rails: 6.1.4
24+
* Rails: 6.1.7
2525

2626

2727
# Shibboleth IDP
@@ -35,8 +35,6 @@ The following are required to install competitions:
3535

3636
# Installation
3737

38-
39-
4038
Configure the following files with your instance's attributes and store the files on the server.
4139

4240
```
@@ -57,10 +55,10 @@ A default [\_settings.scss file](https://get.foundation/sites/docs/sass.html#the
5755
### config/competitions_config.yml
5856
The application's configuration has been consolidated into this file. Here you will configure your instance's values for your mailers, saml authentication, and application variables. Keys, passwords, and secrets will be stored in /config/secrets.yml
5957

60-
Further information on the configurations associated with the [devise_saml_authenticatable gem](https://github.com/apokalipto/devise_saml_authenticatable).
58+
Also see further information regarding [devise_saml_authenticatable gem](https://github.com/apokalipto/devise_saml_authenticatable) configurations.
6159

6260
### config/database.yml
63-
You will need to configure your database connection. For more details please see the rails docs (https://guides.rubyonrails.org/v6.0.3.4/configuring.html#configuring-a-database).
61+
You will need to configure your database connection. For more details please see [the rails docs](https://guides.rubyonrails.org/v6.1.7.6/configuring.html#configuring-a-database).
6462
```
6563
development:
6664
adapter: # postgresql
@@ -72,9 +70,9 @@ development:
7270

7371
### config/deploy_config.yml
7472

75-
Here you will find instance specific values for Capistrano deployment of the application (https://github.com/capistrano/rails).
73+
Here you will find instance specific values for [Capistrano deployment](https://github.com/capistrano/rails) of the application.
7674

77-
If you are symlinking your instance's configuration files on your deployment server, these should be included under the linked_files in config/deploy_config.yml.
75+
Any symlinked configuration files on your instance's deployment server should be included under the `linked_files` in the config/deploy_config.yml.
7876

7977
### config/storage.yml
8078
You will need to configure your instance's storage. The configurations for local or AWS storage are included. It is possible to use other services with further changes.
@@ -105,7 +103,7 @@ The included staging and production environment files require the following to b
105103
* time_zone
106104

107105
### config/secrets.yml
108-
Keys, passwords, secrets, and other sensitive information in a secure file.
106+
Keep keys, passwords, secrets, and other sensitive information in this secure file.
109107

110108
You could use config/credentials.yml for this purpose also.
111109
https://guides.rubyonrails.org/security.html#environmental-security

app/assets/stylesheets/app.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ th,
181181
background-color: $table-head-background;
182182
font-size: .85em;
183183
font-weight: bold;
184+
line-height: 1.25em;
184185
text-align: left;
185186
padding: .25em 0;
186187
vertical-align: bottom;

0 commit comments

Comments
 (0)