Skip to content

Commit

Permalink
Revert "gravitational#2789 hide local login when using SSO"
Browse files Browse the repository at this point in the history
This reverts commit 7f994f0bf6667dbc70d24773357e9e141991b0f9.
  • Loading branch information
ollyg committed Dec 20, 2019
1 parent 75af672 commit b03319f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ darwin
*.zip

# built web assets
# web/dist/app/app
web/dist/app/app

# editors
.vscode
Expand Down
8 changes: 4 additions & 4 deletions web/dist/app/app.58735cf75c867a30fb27.js
Original file line number Diff line number Diff line change
Expand Up @@ -2988,9 +2988,9 @@ var login_LoginInputForm = function (_React$Component2) {
) : react_default.a.createElement(
'div',
null,
/* this.renderNameAndPassFields(), */
/* this.render2faFields(), */
/* this.renderLoginBtn(), */
this.renderNameAndPassFields(),
this.render2faFields(),
this.renderLoginBtn(),
this.renderSsoBtns()
)
),
Expand Down Expand Up @@ -14058,4 +14058,4 @@ var RECEIVE_SITE_EVENTS = 'TLPT_SESSIONS_RECEIVE_EVENTS';

/***/ })

/******/ });
/******/ });

0 comments on commit b03319f

Please sign in to comment.