Skip to content
This repository was archived by the owner on Mar 1, 2026. It is now read-only.

master <- develop (2.1.4) - #520

Merged
peterkos merged 16 commits into
masterfrom
develop
Jan 8, 2021
Merged

master <- develop (2.1.4)#520
peterkos merged 16 commits into
masterfrom
develop

Conversation

@peterkos

@peterkos peterkos commented Jan 6, 2021

Copy link
Copy Markdown
Contributor
  • Fix MyMLH not providing all info crash
  • Properly show error on user edit page when VCS URL is incorrect
JeremyRudman and others added 15 commits December 11, 2020 18:20
* fix(questionnair): missing information now in correct place

it now displays the correct message "Please read & accept" instead of
missing information and the notification is now in the correct place

* Update app/assets/javascripts/validate.js

* Revert "Update app/assets/javascripts/validate.js"

This reverts commit bc54783.

Signed-off-by: Peter Kos <pkos91@icloud.com>

Co-authored-by: Peter Kos <pkos91@icloud.com>
Signed-off-by: Peter Kos <pkos91@icloud.com>
Co-authored-by: Peter Kos <pkos91@icloud.com>
* fix(hakiri): corrected unescaped model attribute

* fix(hakiri): added html_safe to show proper output

Co-authored-by: Jeremy Rudman <jeremyrudman@gmail.com>
Co-authored-by: JeremyRudman <38338616+JeremyRudman@users.noreply.github.com>
fix: Shows questionnaires_closed_message on registration
* feat: Allows agreements to be fully customizable

* fix: Fixes broken migrations

* fix: Migrations misname issue

* feat: Forces agreement links to open in new tab

* Agreement validation detection fixed

Signed-off-by: Peter Kos <pkos91@icloud.com>

* refactor: Removes old input hint

Co-authored-by: Peter Kos <pkos91@icloud.com>
* fix(hakiri): corrected unescaped model attribute

* fix(hakiri): added html_safe to show proper output

* fix(hakiri): added \A \z to regex

* fix(questionnaire): fixed hakiri error with vcs link regex

* fix(questionnaire): fixed houndci commplaint

Co-authored-by: Chris Baudouin, Jr <cjb5326@rit.edu>
Co-authored-by: Peter Kos <pkos91@icloud.com>
…e now case-insensitive, dokku check extended (#485)

* fixed vcs regex to allow upper case

added a extra test to vcs links to test upper case links. also made it
so portfolio links ands vcs links are stored in lower case

* fixed houndci complaints

* lossened username regex and add another test

* made regex more pleasing to read

* made regex method more readable

* checks now does 300 attempts
* fix: Resolves issue preventing new MyMLH users from creating questionnaires (#516)

* fix: Resolves issue preventing new MyMLH users from creating questionnaires

* refactor: Cleans code

* Attempt to pull any # of params from MyMLH

frontend validation is triggered via page skip, whether successful (will skip) or not (no skip)

* Cange error msg, pet hound

Co-authored-by: Peter Kos <pkos91@icloud.com>

* vcs url error now displayed in edit application page (#518)

changed from redirect_to to render "edit" on error. redirect_to makes
a fresh request which causes the error information to be lost

Co-authored-by: Chris Baudouin, Jr <cjb5326@rit.edu>
Co-authored-by: JeremyRudman <38338616+JeremyRudman@users.noreply.github.com>
@peterkos peterkos added the 2.1.4 label Jan 6, 2021
@peterkos
peterkos requested a review from cbaudouinjr January 6, 2021 06:16
@peterkos peterkos self-assigned this Jan 6, 2021
@peterkos
peterkos requested review from JeremyRudman and removed request for cbaudouinjr January 7, 2021 22:55

@JeremyRudman JeremyRudman left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good code 😃

@peterkos
peterkos merged commit 4fa6f6e into master Jan 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

3 participants