diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-29 17:16:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-29 17:16:15 +0300 |
commit | 5370ec1c3d27d646be672039e78161d22b1e2a80 (patch) | |
tree | 1c0ed695576be5560bb4399082f0642bc214f3f1 /app | |
parent | a5baa12bfff6c41f6c9cf156edcf8e621f71848e (diff) |
Add latest changes from gitlab-org/security/gitlab@15-1-stable-ee
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/projects/settings/access_dropdown.js | 2 | ||||
-rw-r--r-- | app/models/clusters/applications/runner.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/projects/settings/access_dropdown.js b/app/assets/javascripts/projects/settings/access_dropdown.js index 79dfa166b1a..7fb7a416dca 100644 --- a/app/assets/javascripts/projects/settings/access_dropdown.js +++ b/app/assets/javascripts/projects/settings/access_dropdown.js @@ -537,7 +537,7 @@ export default class AccessDropdown { return ` <li> <a href="#" class="${isActiveClass}"> - <strong>${escape(key.title)}</strong> + <strong>${key.title}</strong> <p> ${sprintf( __('Owned by %{image_tag}'), diff --git a/app/models/clusters/applications/runner.rb b/app/models/clusters/applications/runner.rb index 1ac4cbac1da..bed0eab5a58 100644 --- a/app/models/clusters/applications/runner.rb +++ b/app/models/clusters/applications/runner.rb @@ -3,7 +3,7 @@ module Clusters module Applications class Runner < ApplicationRecord - VERSION = '0.42.1' + VERSION = '0.41.0' self.table_name = 'clusters_applications_runners' |