Merge in SP23 Main #20

cycomachead · 2024-02-13T01:52:36Z

TODO: Let's get this PR up to spec!

Build test.

…mFile

Merge

This reverts commit 59f1dc8, reversing changes made to 51f8cbd.

…"" This reverts commit 7b664f0.

* 'main' of github.com:snap-cloud/snapcon: Update rails to latest 7.0 patch Bump carrierwave from 2.2.2 to 2.2.5

warrenlet

Clean up the README: delete the previous semester’s badges
Delete non-use readme
Add a helper function to Admin/tickets
Update host variable in email_template_parsr
Other minor fix

warrenlet · 2024-02-18T06:22:41Z

.codeclimate.yml's channel is updated to rubocop-1-56-3
Couldn't resolve codeclimate issues because codeclimate uses Ruby version up tp 2.7. Our repo Ruby version is 3.2.
See details in codeclimate

update: set up rubocop-1-56-3 in branch sp23 main won't update to codeclimate site. I update the rubocop-1-48-1 to main branch and now the codeclimate error is gone.
Also need to fix the remaining issues from codeclimate code check

…nt types view

…emplate

…s repo

…ofile-admin-toggle

…mplate 187057754 event types submission template

187057653 fix "edit profile" shows admin and confirmed toggles as a non-admin

update INSTALL_SNAPCON.md

cycomachead · 2024-03-08T23:56:05Z

Nice, thank you! :D

Justin Pau and others added 30 commits February 16, 2023 15:06

initial

ca8817c

init

6bba07d

fullcalendar

c704cb0

jquery

44559b7

Updated ReadMe

51b350e

created ruby workflow

ff84b13

added status badges

cdda7a7

updated ruby workflow

5a400d9

bluejay file

df1f2fe

Merge branch 'master' of https://github.com/cs169/snapcon

2955d8d

README EDIT - Capital Forked From

3a1a785

Merge branch 'master' of https://github.com/cs169/snapcon

f9ab7de

Build test.

Updated Gemfile to require 2.6.6 or greater instead of 2.7

639f215

Updated Gemfile.lockfor JQuery build issue

aba7bb8

changed requirment for ruby version to be bellow 3 and regenerated Ge…

0a9243c

…mFile

Merge remote-tracking branch 'upstream/main' into merge

c384a51

gemlock

1bd6de0

Merge pull request #1 from cs169/merge

62ecd55

Merge

Update INSTALL_SNAPCON.md

8a63f75

Update INSTALL_SNAPCON.md

094ea48

Delete main.yml

5573108

env file

5731f8a

spec file

1b3887c

Update info.yml

056cde0

Update README.md

ae238f7

.env

51f8cbd

Merge branch 'main' of https://github.com/cs169/snapcon

59f1dc8

Revert "Merge branch 'main' of https://github.com/cs169/snapcon"

7b664f0

This reverts commit 59f1dc8, reversing changes made to 51f8cbd.

Revert "Revert "Merge branch 'main' of https://github.com/cs169/snapcon…

96ab2d8

…"" This reverts commit 7b664f0.

goes back to 5731f8a

b7e6ac5

cycomachead and others added 4 commits February 13, 2024 03:22

Merge branch 'main' of github.com:snap-cloud/snapcon into sp23-main

55f85e9

* 'main' of github.com:snap-cloud/snapcon: Update rails to latest 7.0 patch Bump carrierwave from 2.2.2 to 2.2.5

attempt a workflow file update

9006ab1

Obviously, this is a bad idea

cc2eaba

Clean up legacy code from SP23 Main

cf5fcb1

warrenlet force-pushed the sp23-main branch from d7ae150 to cf5fcb1 Compare February 18, 2024 02:39

warrenlet closed this Feb 18, 2024

warrenlet reopened this Feb 18, 2024

warrenlet force-pushed the sp23-main branch 2 times, most recently from 1837c3b to cf5fcb1 Compare February 18, 2024 06:13

warrenlet reviewed Feb 18, 2024

View reviewed changes

warrenlet force-pushed the sp23-main branch from a00072e to 6cd9b45 Compare February 18, 2024 07:18

Edge7481 and others added 4 commits February 19, 2024 16:33

fix admin toggle showing and is confirm toggleable

9eb4898

changed 'Submission instructions' to 'Submission Template' in new eve…

16d8faa

…nt types view

update INSTALL_SNAPCON.md

1503b90

Update .codeclimate.yml

debc26a

warrenlet force-pushed the sp23-main branch from a2553e2 to debc26a Compare February 23, 2024 20:52

warrenlet and others added 10 commits February 23, 2024 12:56

Merge branch 'main' into sp23-main

d8f9625

renamed event_types attribute submission_instructions to submission_t…

6543594

…emplate

Give up on using partials and just follow the same structure as OSEM'…

c47dd47

…s repo

Merge branch 'main' of github.com:cs169/snapcon into 187057653-fix-pr…

496fa43

…ofile-admin-toggle

Update style from checkbox to yes-no toggle

27240a2

get rid of dead code

fe586cd

Merge branch 'sp23-main' into 187057754-event-types-submission-template

e3accb7

Merge pull request #23 from cs169/187057754-event-types-submission-te…

bbe5451

…mplate 187057754 event types submission template

Merge pull request #22 from cs169/187057653-fix-profile-admin-toggle

da9b573

187057653 fix "edit profile" shows admin and confirmed toggles as a non-admin

Merge pull request #24 from cs169/187057751-update-INSTALL_SNAPCON

a15365e

update INSTALL_SNAPCON.md

warrenlet merged commit fcb1f10 into main Mar 8, 2024
14 of 16 checks passed

cycomachead deleted the sp23-main branch August 1, 2024 02:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge in SP23 Main #20

Merge in SP23 Main #20

cycomachead commented Feb 13, 2024

warrenlet left a comment •

edited

Loading

warrenlet commented Feb 18, 2024 •

edited

Loading

cycomachead commented Mar 8, 2024

Merge in SP23 Main #20

Merge in SP23 Main #20

Conversation

cycomachead commented Feb 13, 2024

warrenlet left a comment • edited Loading

Choose a reason for hiding this comment

warrenlet commented Feb 18, 2024 • edited Loading

cycomachead commented Mar 8, 2024

warrenlet left a comment •

edited

Loading

warrenlet commented Feb 18, 2024 •

edited

Loading