Skip to content
This repository has been archived by the owner on Mar 27, 2019. It is now read-only.

fix invalid github endpoint var name #155

Merged
merged 4 commits into from
Jul 27, 2017
Merged

fix invalid github endpoint var name #155

merged 4 commits into from
Jul 27, 2017

Conversation

lcgkm
Copy link
Contributor

@lcgkm lcgkm commented Jul 27, 2017

No description provided.

djenriquez
djenriquez suggested changes Jul 27, 2017
View reviewed changes
Copy link
Owner

@djenriquez djenriquez left a comment •
edited
Loading

Choose a reason for hiding this comment

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

@lcgkm, we already have this change in master. Github shows that change was made by you here. It seems you need to rebase this, then please apply the changes below:

app/components/Authentication/Github/Github.jsx Outdated
@@ -535,7 +535,7 @@ export default class GithubAuthBackend extends React.Component {
floatingLabelText='GitHub endpoint'
fullWidth={true}
floatingLabelFixed={true}
value={this.state.newConfig.endpoint}
value={this.state.newConfig.base_url}
onChange={(e) => {
this.setState({ newConfig: update(this.state.newConfig, { endpoint: { $set: e.target.value } }) });
Copy link
Owner

Choose a reason for hiding this comment

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

Good catch, but it looks like you missed this one. This line should read:

this.setState({ newConfig: update(this.state.newConfig, { base_url: { $set: e.target.value } }) });

@djenriquez
Copy link
Owner

LGTM, thanks @lcgkm.

@djenriquez djenriquez merged commit 48c12c3 into djenriquez:master Jul 27, 2017
conor-mullen added a commit to Financial-Times/vault-ui that referenced this pull request Jan 31, 2018
@conor-mullen
Merging upstream commits and fixing vulnerabilities (#1)
af96bef 
* ENTRYPOINT with CUSTOM_CA_CERT env var

* Replace HCL parsing library

* Helm chart for vault-ui (djenriquez#149)

* chart import

* README added

* added directory for better clarity

* fix chart description

* Upgrade base image to node:8.1.4-alpine (djenriquez#148)

* Upgrade base image to node:8.1.4-alpine

* fix invalid github endpoint var name

* fix invalid github endpoint var name (djenriquez#155)

* Upgrade base image to node:8.1.4-alpine

* fix invalid github endpoint var name

* Update Github.jsx

* Okta Authentication Backend (djenriquez#156)

* Add Okta resources

* Remove comments

* Add check for required org name

* allows for server port to be configured via env var PORT (djenriquez#162)

* Update PolicyPicker.jsx (djenriquez#169)

* Add login button (djenriquez#172)

* Add login button

* Improve validation

* AppRole Authentication Backend (djenriquez#171)

* Initial commit for approle auth

* Place role name field in new render

* Add property fields + fix create/update

* Complete base functionality

* Update README.md

* Fix README, clarify NODE_TLS_REJECT_UNAUTHORIZED

* Fix typo (djenriquez#176)

* Add ItemList Class (djenriquez#175)

* Introduce ItemList obj

* Upgrade base node image

* Add ItemList to AWS, clean up

* Add ItemList to AWSEc2, clean up

* Fix deleteobject logic

* Fix delete for AWS

* Fix delete for awsec2

* Add max items per page option

* Fix bug that randomly sets page

* Bug fixes + itemlist progress

* More bug fixes

* Cleanup and rename policypicker to itempicker

* Add ItemList to Radius

* Add ItemList to UserPass

* Refactor Secrets to use ItemList

* Fix styling

* Remove case insensitivity

* Clean up directory separator

* Fix delete regression

* Cleanup itemUri

* Breadcrumb Styles Improvement & "copy path" icon button (djenriquez#180)

* improving breadcrumb styles, adding copy path button

* improve spacing

* fix dash issue w/ breadcrumb

* Fix favicon (djenriquez#188)

* Update README.md

Add gitter badge

* Add itemlist to policy management (djenriquez#187)

* Update README.md

* Update LICENSE

* fixing behavior for ALL breaking characters

* Upgrade node to 8.5, remove deprecated MAINTAINER (djenriquez#193)

* clarifies expected value for VAULT_URL_DEFAULT (djenriquez#194)

Adds a notice to the description of the VAULT_URL_DEFAULT parameter explaining that the protocol part of the url is mandatory. This is a workaround for the unclear error message an user gets if it is missing

* Correct the dist reference for the electron app (djenriquez#199)

* Add KV compatibility (djenriquez#198)

* Maintenance: Upgrade packages (djenriquez#200)

* Upgrade dependencies

* Upgrade base node image

* Add stop propogation fix for upgrade bug

* Fix paging bug

* Upgrade react, react-dom, pagination

* Upgrade babel, webpack, extract-text-webpack-plugin; add prop-types in prep for React 16

* Update CHANGELOG

* Update version

* Squash big but easy bug for userpass (djenriquez#201)

* v2.4.0-rc2

* Fix secrets list reset (djenriquez#202)

* Fix navigation bug when access is denied (djenriquez#203)

* Fix path navigation when access is denied

* Cleanup fix

* Improve Vault endpoint check (djenriquez#204)

* empty catch statements don't resolve, breaking behavior if can't create orphan

* Improve styling (djenriquez#207)

* Improve real-estate

* Fix z-index for content container

* Fix scrolling (djenriquez#208)

* Improve real-estate

* Fix z-index for content container

* Fix styling /w @Lucretius help

* Fix right border with overflow enabled

* Reduce right margin

* v2.4.0-rc3

* Upgrade to node alpine-8.8 (djenriquez#218)

* Add logic to handle supplied auth token header (djenriquez#220)

* Fix policy schema (djenriquez#228)

* Add new vault properties

* Update policy schema

* Remove nodemon from default run (djenriquez#227)

* Updated yarn.lock after yarn build

* Updated packagaes

* Specify electron-builder version

* Updated electron to resolve critical vulnerability
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@djenriquez djenriquez djenriquez approved these 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
@lcgkm @djenriquez