Skip to content

Revert changes from PR 1933#1937

Merged
holgerkoser merged 2 commits into
masterfrom
bug/revert-1933
Jun 26, 2024
Merged

Revert changes from PR 1933#1937
holgerkoser merged 2 commits into
masterfrom
bug/revert-1933

Conversation

@holgerkoser
Copy link
Copy Markdown
Member

What this PR does / why we need it:
Dialogs are also closed if the user presses ESC for a select box. Revert the change!

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Release note:


@ghost ghost added needs/review Needs review size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 25, 2024
@gardener-robot-ci-2 gardener-robot-ci-2 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Jun 25, 2024
* master:
  Migrate GProjectDialog to script setup (#1934)

# Conflicts:
#	frontend/src/components/dialogs/GProjectDialog.vue
@gardener-robot-ci-1 gardener-robot-ci-1 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Jun 26, 2024
Copy link
Copy Markdown
Member

@petersutter petersutter left a comment

Choose a reason for hiding this comment

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

/lgtm

@ghost ghost added reviewed/lgtm Has approval for merging reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed needs/review Needs review labels Jun 26, 2024
@holgerkoser holgerkoser merged commit 8eb8d88 into master Jun 26, 2024
@holgerkoser holgerkoser deleted the bug/revert-1933 branch June 26, 2024 12:54
@ghost ghost added the status/closed Issue is closed (either delivered or triaged) label Jun 26, 2024
holgerkoser added a commit that referenced this pull request Jun 26, 2024
* master: (169 commits)
  revert #1933 (#1937)
  Migrate GProjectDialog to script setup (#1934)
  Update connect-kubectl.md
  cancel on esc (#1933)
  fix project menu after vuetify update (#1929)
  Update dependency vuetify to v3.6.10 (#1927)
  Bump braces from 3.0.2 to 3.0.3 (#1922)
  Update dependency vite to v5.3.1 (#1920)
  Update dependency @braintree/sanitize-url to v7.0.3 (#1925)
  Update dependency vue to v3.4.29 (#1921)
  Update dependency jose to v5.4.1 (#1924)
  Update dependency sass to v1.77.6 (#1917)
  Update dependency vuetify to v3.6.9 (#1916)
  Update dependency @vueuse/router to v10.11.0 (#1914)
  Update dependency @vueuse/integrations to v10.11.0 (#1913)
  Update actions/checkout action to v4.1.7 (#1918)
  Update dependency @vueuse/core to v10.11.0 (#1912)
  Adapt the debug and test scripts for `vscode-jest-runner` to be compatible with Vitest. (#1923)
  Update dependency vue-router to v4.3.3 (#1907)
  Update Yarn to v4.3.0 (#1910)
  ...

# Conflicts:
#	.pnp.cjs
#	backend/lib/app.js
#	backend/lib/config/gardener.js
#	backend/lib/security/index.js
#	backend/lib/services/shoots.js
#	frontend/package.json
#	frontend/vite.config.js
#	yarn.lock
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) reviewed/lgtm Has approval for merging reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/closed Issue is closed (either delivered or triaged)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants