Skip to content

master <- develop (2.1.3) #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Dec 25, 2020
Merged

master <- develop (2.1.3) #489

merged 14 commits into from
Dec 25, 2020

Conversation

peterkos
Copy link
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 <[email protected]>

Co-authored-by: Peter Kos <[email protected]>
* fix(hakiri): corrected unescaped model attribute

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

Co-authored-by: Jeremy Rudman <[email protected]>
Co-authored-by: JeremyRudman <[email protected]>
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 <[email protected]>

* refactor: Removes old input hint

Co-authored-by: Peter Kos <[email protected]>
* 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 <[email protected]>
@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
Copy link
Contributor

@JeremyRudman JeremyRudman left a comment

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 join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants