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

master <- develop (2.1.3) - #489

Merged
peterkos merged 14 commits into
masterfrom
develop
Dec 25, 2020
Merged

master <- develop (2.1.3)#489
peterkos merged 14 commits into
masterfrom
develop

Conversation

@peterkos

Copy link
Copy Markdown
Contributor

No description provided.

JeremyRudman and others added 13 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>
@cbaudouinjr
cbaudouinjr marked this pull request as ready for review December 25, 2020 02:56
@peterkos
peterkos marked this pull request as draft December 25, 2020 04:24
…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
@peterkos
peterkos marked this pull request as ready for review December 25, 2020 04:33

@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 2b14f72 into master Dec 25, 2020
@peterkos peterkos added the 2.1.3 label Dec 25, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

3 participants