Skip to content

ui: fix action names broken by #25823#25875

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
couchand:fix/object-literal-shorthand-fail
May 23, 2018
Merged

ui: fix action names broken by #25823#25875
craig[bot] merged 1 commit intocockroachdb:masterfrom
couchand:fix/object-literal-shorthand-fail

Conversation

@couchand
Copy link
Copy Markdown
Contributor

In that PR, I mechanically replaced identifiers when there were new
warnings about shadowing, but in two places I accidentally changed
semantics due to the shorthand form of object literals. 🤦‍♂️

Release note: None

In that PR, I mechanically replaced identifiers when there were new
warnings about shadowing, but in two places I accidentally changed
semantics due to the shorthand form of object literals.  🤦‍♂️

Release note: None
@couchand couchand requested a review from a team May 23, 2018 20:40
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@couchand
Copy link
Copy Markdown
Contributor Author

bors r+

craig bot pushed a commit that referenced this pull request May 23, 2018
25868: sql: Log event for TRUNCATE TABLE r=a-robinson a=a-robinson

Fixes #25867

Release note (sql change): TRUNCATE TABLE commands are now logged in the
event log.

25871: ui: unbreak `make watch` r=vilterp a=vilterp

By telling Webpack to proxy the path `/` through to the Cockroach process.
Webpack used to serve `/` itself from a static file, but as of #25195 we
generate `/` dynamically in Go, so we can use it to pass login state to
the UI.

Fixes #25858

Release note: None

25875: ui: fix action names broken by #25823 r=couchand a=couchand

In that PR, I mechanically replaced identifiers when there were new
warnings about shadowing, but in two places I accidentally changed
semantics due to the shorthand form of object literals.  🤦‍♂️

Release note: None

Co-authored-by: Alex Robinson <alexdwanerobinson@gmail.com>
Co-authored-by: Pete Vilter <vilterp@cockroachlabs.com>
Co-authored-by: Andrew Couch <andrew@cockroachlabs.com>
@craig
Copy link
Copy Markdown
Contributor

craig bot commented May 23, 2018

Build succeeded

@craig craig bot merged commit 4232d7f into cockroachdb:master May 23, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants