Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
288 commits
Select commit Hold shift + click to select a range
2baebbc
Merge branch 'main' of https://github.com/cs169/berkeley-reentry-stud…
MaxYang24 Apr 20, 2023
bf28b79
first commit
MaxYang24 Apr 20, 2023
a866e29
always expanded nav bar
EthanqX Apr 20, 2023
e022283
Merge pull request #7 from cs169/185001925-navbar_scholarships_page
MaxYang24 Apr 20, 2023
3074f93
added courses page
MaxYang24 Apr 20, 2023
6fdbd30
added rspec
MaxYang24 Apr 20, 2023
27bb973
added cucumber test
MaxYang24 Apr 20, 2023
c141d58
cl fix try_1
MaxYang24 Apr 20, 2023
828796c
try1 rspec for courses_controller
MaxYang24 Apr 21, 2023
0914775
Merge branch 'main' of https://github.com/cs169/berkeley-reentry-stud…
MaxYang24 Apr 21, 2023
4296939
Merge pull request #10 from cs169/add_courses
EthanqX Apr 21, 2023
6d7f9a5
added nav bars
MaxYang24 Apr 21, 2023
07bf064
Merge branch 'main' of https://github.com/cs169/berkeley-reentry-stud…
MaxYang24 Apr 21, 2023
be7837f
changed colors of navbars and text
MaxYang24 Apr 21, 2023
d5f5dbd
Merge branch 'main' into add_navbars
MaxYang24 Apr 21, 2023
78a2924
Merge pull request #11 from cs169/add_navbars
EthanqX Apr 21, 2023
702da5a
Merge branch 'main' of https://github.com/cs169/berkeley-reentry-stud…
MaxYang24 Apr 21, 2023
dc1dc5a
try_fix
MaxYang24 Apr 26, 2023
8a3b30b
added rspec
MaxYang24 Apr 26, 2023
652a19f
Merge pull request #13 from cs169/fix_appointment_bug
smanchkanti Apr 26, 2023
7e61efb
ignore .DS_Store
MaxYang24 Apr 27, 2023
4fcdee5
Podcast page added
Apr 26, 2023
a08a454
Test for podcast page
Apr 26, 2023
0104e64
Resolved conflict with DS_Store
Apr 26, 2023
55c57e6
Added rspec file for podcast
Apr 27, 2023
0f8d70e
Fixed rspec issue
Apr 27, 2023
361ca7e
Merge pull request #15 from cs169/185015924_add_podcast
gekerd Apr 27, 2023
846db10
changed README.md
MaxYang24 May 1, 2023
23c2110
Merge pull request #17 from cs169/change_readme
EthanqX May 1, 2023
46a6d57
Update pages view
gekerd May 1, 2023
368ce60
Merge pull request #18 from cs169/margins_update
gekerd May 1, 2023
5e7c14f
Allow Manually triggering CI run
cycomachead Feb 11, 2025
eff6d3b
Merge pull request #19 from cs169/cycomachead-patch-1
cycomachead Feb 11, 2025
8486c0e
Ready for Heroku deployment
mandywong0 Mar 3, 2025
77194ec
modified gemfile to specify sqlite3 version
mandywong0 Mar 3, 2025
01973bf
removed sqlite3 and update Gemfile
mandywong0 Mar 3, 2025
ececb3d
added sqlite3 back
mandywong0 Mar 3, 2025
cf1520f
added concurrent ruby 1.3.4 to gemfile because rake db wasnt working
mandywong0 Mar 3, 2025
c12f6af
Button shoud work
WinbrosXP Mar 3, 2025
f43fa74
Re-generate Gemfile.lock to reflect production settings
mandywong0 Mar 3, 2025
db45f35
Trigger Heroku deployment
mandywong0 Mar 3, 2025
0e8c779
just want to deploy again
mandywong0 Mar 3, 2025
8b363a9
Add x86_64-linux platform to Gemfile.lock
mandywong0 Mar 3, 2025
bf217e4
Fix dependency issues
mandywong0 Mar 3, 2025
b33410c
Merge pull request #25 from cs169/fix-appt-bttn
sherher21 Mar 3, 2025
a9047ad
Updated readme to include new info and fixed formatting
sherher21 Mar 4, 2025
f945ce7
Added info about postgres db on heroku and notes about environmental …
sherher21 Mar 4, 2025
27b877d
Update .gitignore
WinbrosXP Mar 5, 2025
97f463f
params[:page] was being treated as int
WinbrosXP Mar 5, 2025
81d6998
Added instructions for Linux users
sherher21 Mar 6, 2025
c1bb4eb
changed up wording on home page and check-in page
mandywong0 Mar 6, 2025
14674ca
Merge pull request #35 from cs169/31-check-in-records-error
mandywong0 Mar 7, 2025
d8d3b11
Merge pull request #33 from cs169/mandy
WinbrosXP Mar 7, 2025
2e86da7
changed checkin page wording to RSP
mandywong0 Mar 7, 2025
48038d6
Merge pull request #36 from cs169/mandy
WinbrosXP Mar 7, 2025
06b2013
Added codeblock around Linux instructions
sherher21 Mar 7, 2025
f4f4a1b
Updated the restriction of SID in login.
KefengDuan1 Mar 7, 2025
7e84b7d
Merge pull request #37 from cs169/kefengduan
sherher21 Mar 7, 2025
a0baf4e
Merge pull request #26 from cs169/20-update-readme
KefengDuan1 Mar 7, 2025
8a7a907
Added autofill functionality for check-in reasons
henwanfan Mar 8, 2025
6026ecf
Merge branch 'main' into autofill_checkin
henwanfan Mar 8, 2025
5739fcb
Merge pull request #38 from cs169/autofill_checkin
sherher21 Mar 8, 2025
d72be3c
Appt page now includes cris and julio
WinbrosXP Mar 10, 2025
202bddd
Window adjustment
WinbrosXP Mar 10, 2025
a3abfe9
Merge pull request #39 from cs169/update-counselors
sherher21 Mar 10, 2025
5e03800
add rubocop workflow.
KefengDuan1 Mar 12, 2025
3c8f39b
add rubocop to ReadMe.md
KefengDuan1 Mar 12, 2025
078a9a1
use rubocop to make safe edit.
KefengDuan1 Mar 12, 2025
ce802c7
unsafe edit.
KefengDuan1 Mar 12, 2025
de54563
correct the wrong fix due to RuboCop unsafe edit.
KefengDuan1 Mar 12, 2025
350f3a6
Fix BOM problem caused by Rubo unsafe edit.
KefengDuan1 Mar 12, 2025
75e276a
Added new relic gem and yml file
sherher21 Mar 13, 2025
bc8d60b
Removed info.yml
sherher21 Mar 13, 2025
862f0bd
Merge pull request #43 from cs169/kefengduan
sherher21 Mar 13, 2025
fd38115
Merge pull request #45 from cs169/44-setup-new-relic-apm-on-heroku
sherher21 Mar 13, 2025
774325e
Updated badges on readme and linted code
sherher21 Mar 13, 2025
2dc7bc2
Merge pull request #46 from cs169/readme-cleanup
KefengDuan1 Mar 13, 2025
fc5b9b5
Upgraded to ruby 3.0.7 (last of 3.0.*)
WinbrosXP Mar 13, 2025
19d9407
Updated newrelic.yml
sherher21 Mar 13, 2025
c602f72
Merge pull request #48 from cs169/47-remove-secret-key
sherher21 Mar 13, 2025
ea955fd
Update README.md
KefengDuan1 Mar 13, 2025
3f00797
Update README.md
KefengDuan1 Mar 13, 2025
4fb1902
Add RuboCop Description in README.md
KefengDuan1 Mar 13, 2025
c95024a
Ruby updated to 3.1.0(First 3.1.*)
WinbrosXP Mar 14, 2025
dcc861c
Upgrade ruby to 3.1.6(last 3.1.*)
WinbrosXP Mar 14, 2025
7af0d90
Merge branch 'main' of github.com:cs169/berkeley-reentry-student-prog…
WinbrosXP Mar 14, 2025
8fd3cf1
Update ruby version file
WinbrosXP Mar 17, 2025
b6451f5
Updated ruby ver in workflow
WinbrosXP Mar 17, 2025
5ffb88a
Update ruby in rubocop workflow
WinbrosXP Mar 17, 2025
1cde44b
Upgrade to ruby 3.2.0 (first 3.2.*)
WinbrosXP Mar 19, 2025
55f4568
Upgrade to ruby 3.2.0 (first 3.2.*)
WinbrosXP Mar 19, 2025
8ef7a54
Updated rubocop
WinbrosXP Mar 19, 2025
f85b316
Upgrade to ruby 3.2.7 (last 3.2.*, last upgrade)
WinbrosXP Mar 19, 2025
b82bfff
Upgrade to rails 6.1.7.10 (last 6.*)
WinbrosXP Mar 19, 2025
becbadb
Upgrade to rails 7.0.0 (first 7.*), cucumber 3.2, cucumber rails 2.6.1
WinbrosXP Mar 19, 2025
48f5453
Upgrade to rails 7.0.0 (first 7.*), cucumber 3.2, cucumber rails 2.6.1
WinbrosXP Mar 19, 2025
039ae01
Upgrade to rails 7.0.0 (first 7.*), cucumber 3.2, cucumber rails 2.6.1
WinbrosXP Mar 19, 2025
64af7b1
Upgraded rails to 7.0.8, other updates in gemfile for rails compatibi…
WinbrosXP Mar 20, 2025
58b7ec7
db update
WinbrosXP Mar 20, 2025
911180d
Trying to diagnose Logger error
WinbrosXP Mar 20, 2025
2a67b2e
Trying to diagnose Logger error
WinbrosXP Mar 20, 2025
525cea6
Trying to diagnose Logger error
WinbrosXP Mar 20, 2025
d95b3f5
updated content on scholarship and courses pages. updated UI across w…
mandywong0 Mar 21, 2025
0c3b6d1
reversed gitignore changes
mandywong0 Mar 21, 2025
930a8f6
Merge pull request #60 from cs169/mandy
sherher21 Mar 21, 2025
96f625f
Replace Counselor Appointment with Drop-in Advising in Checkin dropdown
henwanfan Mar 21, 2025
c803fd4
Merge pull request #61 from cs169/update-checkin-dropdown-57
WinbrosXP Mar 21, 2025
baba7ad
New spec/requests folder for converting controller to request specs
WinbrosXP Mar 21, 2025
671036e
Request test for admin functions
WinbrosXP Mar 24, 2025
8a60164
Added working canvas authentication
sherher21 Mar 27, 2025
8d25576
Removed storing token in database and updated root page
sherher21 Mar 27, 2025
4eba949
Restored google login
sherher21 Mar 28, 2025
a0c6785
Added rspec tests for bcourse authentication
sherher21 Mar 31, 2025
685df93
Added failing cucumber tests
sherher21 Mar 31, 2025
a19c38e
Conversions to request tests for admins and checkin
WinbrosXP Mar 31, 2025
ebb1abe
Linter
sherher21 Apr 1, 2025
bceb147
Merge pull request #62 from cs169/bcourse-authentication
sherher21 Apr 1, 2025
00076c6
Removed checkin_controller_spec and converted to request test
WinbrosXP Apr 3, 2025
24255cb
Fixed issue with cucumber tests
WinbrosXP Apr 3, 2025
638234a
Merge branch 'main' into ruby-updates
WinbrosXP Apr 3, 2025
a82dbad
Rubocop deprecation fix
WinbrosXP Apr 3, 2025
44ee0c1
Merge branch 'ruby-updates' of github.com:cs169/berkeley-reentry-stud…
WinbrosXP Apr 3, 2025
ff99f59
Merge pull request #69 from cs169/ruby-updates
henwanfan Apr 3, 2025
b9bf8aa
Implement Event model and basic controller functionality (#63)
henwanfan Apr 3, 2025
6e4385a
updated ruby version after mergint from main
mandywong0 Apr 3, 2025
ae8c0ba
fixed merge conflicts?
mandywong0 Apr 3, 2025
48aa197
fixed merge conflicts?
mandywong0 Apr 3, 2025
cb9b0b0
removed trailing period on accessibility.feature
mandywong0 Apr 3, 2025
a819d6c
fix the failure of cucumber test.
KefengDuan1 Apr 4, 2025
bdc3e5e
Fix RuboCop issues in Event model
henwanfan Apr 4, 2025
62bf657
Recreate Gemfile.lock
mandywong0 Apr 4, 2025
65ca9d0
updated gemfile.lock
mandywong0 Apr 4, 2025
a594fb0
disabled webmock if selenium chrome in capybara.rb
mandywong0 Apr 4, 2025
c757acb
revert wrong fix.
KefengDuan1 Apr 4, 2025
72c4297
Added partial for navbar, still testing
WinbrosXP Apr 4, 2025
35c9680
Removed duplicate navbars from views (hopefully all)
WinbrosXP Apr 4, 2025
e6e1eed
Merge pull request #73 from cs169/kefengduan
henwanfan Apr 4, 2025
dd029fe
Merge pull request #71 from cs169/feature/63-event-model-controller
henwanfan Apr 4, 2025
869c322
fixed webmock and capybara conflicts
mandywong0 Apr 4, 2025
22844c7
support loading scholarships from database.
KefengDuan1 Apr 6, 2025
4ce01f8
update README.md for database.
KefengDuan1 Apr 6, 2025
48f3c01
fixes made by RuboCop
KefengDuan1 Apr 6, 2025
ac00104
Merge pull request #72 from cs169/mandy
henwanfan Apr 7, 2025
ad58bc4
Merge with main
WinbrosXP Apr 7, 2025
540b52a
Added events to navbar
WinbrosXP Apr 7, 2025
2fa953a
Fixing events link
WinbrosXP Apr 7, 2025
fa4b3d2
Fixing events link
WinbrosXP Apr 7, 2025
d6c3756
Fixing events link
WinbrosXP Apr 7, 2025
60139e9
Fixing accessibility
WinbrosXP Apr 7, 2025
38396f1
Started cucumber scenario for events
WinbrosXP Apr 7, 2025
abd5555
Started cucumber scenario for events
WinbrosXP Apr 7, 2025
c79aca6
Fix rubocop issue
WinbrosXP Apr 7, 2025
985a539
Merge pull request #74 from cs169/kefengduan
WinbrosXP Apr 7, 2025
01b271b
Merge branch 'main' into 52-navbar
mandywong0 Apr 7, 2025
0334ab6
Merge pull request #75 from cs169/52-navbar
mandywong0 Apr 7, 2025
e382919
Implement Events page with upcoming and past events sections
henwanfan Apr 7, 2025
e78ddd7
removed events from database as it was not working, using rails conso…
henwanfan Apr 7, 2025
96498b9
Add events page with upcoming and past events display
henwanfan Apr 7, 2025
f24b61f
Merge pull request #76 from cs169/feature/64-events-page-ui
henwanfan Apr 8, 2025
80663b0
Merge changes from main
WinbrosXP Apr 9, 2025
bd15c97
Merged changes from main
WinbrosXP Apr 9, 2025
5ee9612
Fix rubocop offenses
WinbrosXP Apr 9, 2025
4df60ce
Removed controller tests that have been converted
WinbrosXP Apr 9, 2025
9d79f87
Trigger deploy on new stack
WinbrosXP Apr 9, 2025
5cf91fa
Added model Advisor
sherher21 Apr 9, 2025
f1774bb
support edit scholarships.
KefengDuan1 Apr 9, 2025
ef4ecf8
rubocop fix.
KefengDuan1 Apr 9, 2025
a99b350
feature:remove scholarships.
KefengDuan1 Apr 9, 2025
02cb505
feature: add_scholarships.
KefengDuan1 Apr 10, 2025
244fee0
fix bugs in deleting scholarships
KefengDuan1 Apr 10, 2025
2970cef
RuboCop fixes.
KefengDuan1 Apr 10, 2025
b0edcf8
Added advisor admin feature
sherher21 Apr 10, 2025
b2d542c
added admin views for event index and event create. implemented creat…
mandywong0 Apr 10, 2025
d4f2709
fixed rubocup failures
mandywong0 Apr 10, 2025
fc58ea6
Merge pull request #80 from cs169/kefengduan
henwanfan Apr 10, 2025
f7f7dcd
Merge pull request #81 from cs169/delete_scholarships
henwanfan Apr 10, 2025
fbd46a6
Merge pull request #82 from cs169/add_scholarships
henwanfan Apr 10, 2025
58d2373
Merge branch 'main' into 30-add-function-to-addremove-counselors-and-…
henwanfan Apr 10, 2025
f4d7815
Merge pull request #83 from cs169/30-add-function-to-addremove-counse…
henwanfan Apr 10, 2025
24485a4
Merge branch 'main' into event_admin
sherher21 Apr 10, 2025
b9f0a8b
Merge pull request #84 from cs169/event_admin
sherher21 Apr 10, 2025
40635cb
Merge branch 'main' into 40-update-ruby-rails-heroku
WinbrosXP Apr 10, 2025
0ab8019
Merge branch 'main' into 40-update-ruby-rails-heroku
WinbrosXP Apr 10, 2025
0a91177
Merge branch '40-update-ruby-rails-heroku' of github.com:cs169/berkel…
WinbrosXP Apr 10, 2025
2ab623a
Rubocop fix
WinbrosXP Apr 10, 2025
6265a4b
Removes remaining controller tests, removes failing cucumber steps
WinbrosXP Apr 11, 2025
77eb47f
Fixing webmock issue
WinbrosXP Apr 11, 2025
c47c2de
Rubocop fixes
WinbrosXP Apr 11, 2025
3b8f2dd
Merge pull request #79 from cs169/40-update-ruby-rails-heroku
sherher21 Apr 11, 2025
cbddd2d
Merge branch 'main' into branch-to-golden-repo
sherher21 Apr 11, 2025
6f8cc33
Fixed canvas bug
sherher21 Apr 11, 2025
b472370
Merge pull request #85 from cs169/fix-canvas-auth
sherher21 Apr 11, 2025
1684cb9
Installed Action Text
sherher21 Apr 11, 2025
e69b048
Merge pull request #87 from cs169/86-add-action-text-for-rich-text-ed…
WinbrosXP Apr 11, 2025
4be8413
added edit functionality, used datatables, small changes to event UI
mandywong0 Apr 16, 2025
973c3da
Resolve merge conflicts
mandywong0 Apr 16, 2025
46493ca
fixed flash msg color
mandywong0 Apr 16, 2025
7bade50
rubucop fix
mandywong0 Apr 16, 2025
6ad3e01
more flash changes and added a few accessibility checks for event admin
mandywong0 Apr 16, 2025
5c64f55
Merge pull request #89 from cs169/event_admin
KefengDuan1 Apr 16, 2025
6c7217a
created courses model
henwanfan Apr 18, 2025
26cf3f0
Add course management functionality
henwanfan Apr 18, 2025
9b75e88
Fix rendering issue in manage_courses action
henwanfan Apr 18, 2025
4579be0
Update admin and fixed student view
henwanfan Apr 18, 2025
d20f4b5
fixed student view
henwanfan Apr 18, 2025
7a374a9
Fix RuboCop
henwanfan Apr 18, 2025
ad64ce8
Fix courses spec test to handle when no courses are available
henwanfan Apr 18, 2025
18ba890
fixed rubocop
henwanfan Apr 18, 2025
b038939
Merge pull request #90 from cs169/feature/course-management
WinbrosXP Apr 18, 2025
bd7cab9
WIP: add feature file for admin event management
mandywong0 Apr 21, 2025
d82bdb6
Fix navbar to highlight current page
henwanfan Apr 21, 2025
23ab9d5
Mock canvas login
WinbrosXP Apr 21, 2025
7738a65
Mock canvas login
WinbrosXP Apr 21, 2025
264cc35
WOrking on mock login
WinbrosXP Apr 21, 2025
a9c9d7e
WOrking on mock login
WinbrosXP Apr 21, 2025
cfc7213
fixed delete functionality and added export functionality
mandywong0 Apr 21, 2025
080fa21
Merge pull request #93 from cs169/fix/navbar-highlighting
mandywong0 Apr 21, 2025
1f1e806
WIP: add feature file for admin event management
mandywong0 Apr 21, 2025
effa3af
fixed delete functionality and added export functionality
mandywong0 Apr 21, 2025
4486094
Merge remote-tracking branch 'origin/event_admin' into event_admin
mandywong0 Apr 21, 2025
71620a1
WOrking on mock login
WinbrosXP Apr 21, 2025
d541706
delete line in feature file events admin for now
mandywong0 Apr 21, 2025
dbb1645
WOrking on mock login
WinbrosXP Apr 21, 2025
6a75c84
WOrking on mock login
WinbrosXP Apr 21, 2025
e14332b
WOrking on mock login
WinbrosXP Apr 21, 2025
a43741c
WOrking on mock login
WinbrosXP Apr 21, 2025
e7d3dc8
WOrking on mock login
WinbrosXP Apr 21, 2025
755ac26
WOrking on mock login
WinbrosXP Apr 21, 2025
79a50df
WOrking on mock login
WinbrosXP Apr 21, 2025
97e6e20
WOrking on mock login
WinbrosXP Apr 21, 2025
0a750f9
WOrking on mock login
WinbrosXP Apr 21, 2025
df9815e
WOrking on mock login
WinbrosXP Apr 21, 2025
5ef2f80
WOrking on mock login
WinbrosXP Apr 21, 2025
881e71c
Merge pull request #94 from cs169/event_admin
WinbrosXP Apr 21, 2025
cbe4d29
Rubocop fixes
WinbrosXP Apr 21, 2025
22dca08
Merge pull request #96 from cs169/fake-login
mandywong0 Apr 22, 2025
7fa5dab
Standalize Scholarships tables and Add Export Button.
KefengDuan1 Apr 23, 2025
f847a43
RuboCop fix.
KefengDuan1 Apr 23, 2025
2e0e4aa
Stored keys/secrets in credentials.yml
WinbrosXP Apr 23, 2025
92f3418
Merge pull request #99 from cs169/branch-to-golden-repo
sherher21 Apr 23, 2025
04f4fff
Merge pull request #102 from cs169/100-secrets-keys
sherher21 Apr 24, 2025
083338d
Updated Project Status and Heroku deployment
sherher21 Apr 24, 2025
78c20e3
Added user role admin feature
sherher21 Apr 24, 2025
bb9ad56
Merge pull request #104 from cs169/103-add-user-admin-feature
WinbrosXP Apr 24, 2025
dff54a0
Added new relic and canvas blurb
sherher21 Apr 24, 2025
bbd3219
Updated credentials and calls to ENV
sherher21 Apr 24, 2025
808815a
Updated Canvas README
sherher21 Apr 24, 2025
d7ae1bb
Merge pull request #105 from cs169/51-add-info-to-readme-about-new-re…
WinbrosXP Apr 24, 2025
b334377
Merge pull request #106 from cs169/main
WinbrosXP Apr 24, 2025
300f7b3
Fixing keys for google
WinbrosXP Apr 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: build

on: [push, pull_request]
on:
- push
- pull_request
- workflow_dispatch

jobs:
build:
Expand All @@ -11,10 +14,10 @@ jobs:
TZ: America/Los_Angeles
steps:
- uses: actions/checkout@v1
- name: Install Ruby (3.0)
- name: Install Ruby (3.2.7)
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.0.3
ruby-version: 3.2.7
bundler-cache: true

- name: Set up Code Climate test-reporter
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
### [Pivotal Tracker Link][tracker]

<!-- Complete this section filling in the link to a tracker story. -->
[tracker]: https://www.pivotaltracker.com/story/show/your-story-id

## What this PR does:
<!-- Complete the following sentence: -->

This pull request fixes|implements (pick one...) ______.

### Include screenshots, videos, etc.

#### Who authored this PR?
<!-- Tag the names of any other contributors -->


### How should this PR be tested?

* Is there a deploy we can view?
* What do the specs/features test?
* Are there edge cases to watch out for?

#### Are there any complications to deploying this?

<!-- Data migrations, upgrades, etc. -->

### Checklist:

- [ ] Has this been deployed to a staging environment or reviewed by a customer?
- [ ] Tag someone for code review (either a coach / team member)
- [ ] I have renamed the branch to match PivotTracker's suggested one (necessary for BlueJay) (e.g. `michael/12345-add-new-feature` Any branch name will do as long as the story ID is there. You can use `git checkout -b [new-branch-name]`)
19 changes: 19 additions & 0 deletions .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: RuboCop

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-latest
env:
BUNDLE_WITHOUT: default doc job cable storage ujs test db

steps:
- uses: actions/checkout@v2
- name: Set up Ruby 3.2.7
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.7
bundler-cache: true
- name: Run RuboCop
run: bundle exec rubocop --parallel
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,15 @@

# Ignore application configuration
/config/application.yml

/.DS_Store
/app/.DS_Store
/app/views/.DS_Store
/app/assets/.DS_Store
/app/assets/images/.DS_Store
/db/.DS_Store
/lib/.DS_Store
.DS_Store
.vs/
.vs
.vscode
299 changes: 287 additions & 12 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,292 @@
Style/Documentation:
Enabled: false
plugins:
- rubocop-performance
- rubocop-rails
- rubocop-rspec

Metrics:
AllCops:
TargetRubyVersion: 3.2
# RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
# to ignore them, so only the ones explicitly set in this file are enabled.
DisabledByDefault: true
SuggestExtensions: false
Exclude:
- 'bin/*'
- 'db/*'
- '**/tmp/**/*'
- '**/templates/**/*'
- '**/vendor/**/*'
- '**/node_modules/**/*'
- 'bin/*'
- db/migrate/*.rb
- db/schema.rb
- '.vs/**/*'

Lint:
Performance:
Exclude:
- 'bin/*'
- 'db/*'
- '**/sprc/**/*'

Layout:
Exclude:
- 'bin/*'
- 'db/*'
# Prefer assert_not over assert !
Rails/AssertNot:
Include:
- '**/test/**/*'

# Prefer assert_not_x over refute_x
Rails/RefuteMethods:
Include:
- '**/test/**/*'

Rails/IndexBy:
Enabled: true

Rails/IndexWith:
Enabled: true

# Prefer &&/|| over and/or.
Style/AndOr:
Enabled: true

# Align `when` with `case`.
Layout/CaseIndentation:
Enabled: true

Layout/ClosingHeredocIndentation:
Enabled: true

Layout/ClosingParenthesisIndentation:
Enabled: true

# Align comments with method definitions.
Layout/CommentIndentation:
Enabled: true

Layout/ElseAlignment:
Enabled: true

# Align `end` with the matching keyword or starting expression except for
# assignments, where it should be aligned with the LHS.
Layout/EndAlignment:
Enabled: true
EnforcedStyleAlignWith: variable
AutoCorrect: true

Layout/EndOfLine:
Enabled: true

Layout/EmptyLineAfterMagicComment:
Enabled: true

Layout/EmptyLinesAroundAccessModifier:
Enabled: true
EnforcedStyle: only_before

Layout/EmptyLinesAroundBlockBody:
Enabled: true

# In a regular class definition, no empty lines around the body.
Layout/EmptyLinesAroundClassBody:
Enabled: true

# In a regular method definition, no empty lines around the body.
Layout/EmptyLinesAroundMethodBody:
Enabled: true

# In a regular module definition, no empty lines around the body.
Layout/EmptyLinesAroundModuleBody:
Enabled: true

# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
Style/HashSyntax:
Enabled: true

# Method definitions after `private` or `protected` isolated calls need one
# extra level of indentation.
Layout/IndentationConsistency:
Enabled: true
EnforcedStyle: normal

# Two spaces, no tabs (for indentation).
Layout/IndentationWidth:
Enabled: true
Width: 2

Layout/LeadingCommentSpace:
Enabled: true

Layout/SpaceAfterColon:
Enabled: true

Layout/SpaceAfterComma:
Enabled: true

Layout/SpaceAfterSemicolon:
Enabled: true

Layout/SpaceAroundEqualsInParameterDefault:
Enabled: true

Layout/SpaceAroundKeyword:
Enabled: true

Layout/SpaceAroundOperators:
Enabled: true

Layout/SpaceBeforeComma:
Enabled: true

Layout/SpaceBeforeComment:
Enabled: true

Layout/SpaceBeforeFirstArg:
Enabled: true

Style/DefWithParentheses:
Enabled: true

# Defining a method with parameters needs parentheses.
Style/MethodDefParentheses:
Enabled: true

Style/ExplicitBlockArgument:
Enabled: true

Style/FrozenStringLiteralComment:
Enabled: true
EnforcedStyle: always

Style/RedundantFreeze:
Enabled: true

# Use `foo {}` not `foo{}`.
Layout/SpaceBeforeBlockBraces:
Enabled: true

# Use `foo { bar }` not `foo {bar}`.
Layout/SpaceInsideBlockBraces:
Enabled: true
EnforcedStyleForEmptyBraces: space

# Use `{ a: 1 }` not `{a:1}`.
Layout/SpaceInsideHashLiteralBraces:
Enabled: true

Layout/SpaceInsideParens:
Enabled: true

# Check quotes usage according to lint rule below.
Style/StringLiterals:
Enabled: true
EnforcedStyle: double_quotes

# Detect hard tabs, no hard tabs.
Layout/IndentationStyle:
Enabled: true

# Empty lines should not have any spaces.
Layout/TrailingEmptyLines:
Enabled: true

# No trailing whitespace.
Layout/TrailingWhitespace:
Enabled: true

# Use quotes for string literals when they are enough.
Style/RedundantPercentQ:
Enabled: true

Lint/AmbiguousOperator:
Enabled: true

Lint/AmbiguousRegexpLiteral:
Enabled: true

Lint/DuplicateRequire:
Enabled: true

Lint/DuplicateMethods:
Enabled: true

Lint/ErbNewArguments:
Enabled: true

# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
Lint/RequireParentheses:
Enabled: true

Lint/RedundantStringCoercion:
Enabled: true

Lint/UriEscapeUnescape:
Enabled: true

Lint/UselessAssignment:
Enabled: true

Lint/DeprecatedClassMethods:
Enabled: true

Style/ParenthesesAroundCondition:
Enabled: true

Style/HashTransformKeys:
Enabled: true

Style/HashTransformValues:
Enabled: true

Style/RedundantBegin:
Enabled: true

Style/RedundantReturn:
Enabled: true
AllowMultipleReturnValues: true

Style/RedundantRegexpEscape:
Enabled: true

Style/Semicolon:
Enabled: true
AllowAsExpressionSeparator: true

# Prefer Foo.method over Foo::method
Style/ColonMethodCall:
Enabled: true

Style/TrivialAccessors:
Enabled: true

Performance/BindCall:
Enabled: true

Performance/FlatMap:
Enabled: true

Performance/MapCompact:
Enabled: true

Performance/SelectMap:
Enabled: true

Performance/RedundantMerge:
Enabled: true

Performance/StartWith:
Enabled: true

Performance/EndWith:
Enabled: true

Performance/RegexpMatch:
Enabled: true

Performance/ReverseEach:
Enabled: true

Performance/StringReplacement:
Enabled: true

Performance/UnfreezeString:
Enabled: true

Performance/DeletePrefix:
Enabled: true

Performance/DeleteSuffix:
Enabled: true
Loading