Skip to content
This repository has been archived by the owner on Oct 20, 2021. It is now read-only.

Add mfa #36

Merged
merged 1 commit into from
Jun 12, 2020
Merged

Add mfa #36

merged 1 commit into from
Jun 12, 2020

Conversation

bergice
Copy link
Contributor

@bergice bergice commented Jun 9, 2020

See #35

@brynwhyman brynwhyman mentioned this pull request Jun 9, 2020
Closed
3 tasks
@dnsl48 dnsl48 self-requested a review June 10, 2020 03:49
dnsl48
dnsl48 suggested changes Jun 10, 2020
View reviewed changes
Copy link
Contributor

@dnsl48 dnsl48 left a comment

Choose a reason for hiding this comment

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

that should become a part of the next minor release (2.6)

@bergice bergice changed the base branch from 2.5 to 2 June 10, 2020 03:55
@dnsl48
Copy link
Contributor

dnsl48 commented Jun 10, 2020 •
edited
Loading

merge checklist

  • the target branch is correct
  • all commits are relevant (e.g. no debugging and linting)
  • the commit messages follow the contribution guidelines
  • the patch follows the contribution guidelines
  • new features are covered with tests (back-end with unit tests, front-end with Behat)
  • the relevant CMS documentation is updated; changelog for impactful changes
  • CI is green
  • at least one peer reviewer approved; no changes requested

dnsl48
dnsl48 previously approved these changes Jun 10, 2020
View reviewed changes
Copy link
Contributor

@dnsl48 dnsl48 left a comment

Choose a reason for hiding this comment

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

looks good

@dnsl48 dnsl48 dismissed their stale review June 10, 2020 04:59

needs a rebase

dnsl48
dnsl48 suggested changes Jun 10, 2020
View reviewed changes
Copy link
Contributor

@dnsl48 dnsl48 left a comment

Choose a reason for hiding this comment

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

@bergice there's a different starter-theme version in the branch 2
could you rebase please?

@bergice bergice force-pushed the pulls/2.5/add-mfa branch from 106768d to 7e395cf Compare June 11, 2020 12:56
@dnsl48 dnsl48 merged commit 44fec86 into silverstripe:2 Jun 12, 2020
@dnsl48 dnsl48 deleted the pulls/2.5/add-mfa branch June 12, 2020 01:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dnsl48 dnsl48 dnsl48 requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bergice @dnsl48