Add latest changes from gitlab-org/gitlab@master

2 files changed, 28 insertions, 12 deletions

diff --git a/app/assets/javascripts/vue_shared/components/web_ide_link.vue b/app/assets/javascripts/vue_shared/components/web_ide_link.vue
index cac0d5a45c9..6d179b3dc92 100644
--- a/app/assets/javascripts/vue_shared/components/web_ide_link.vue
+++ b/app/assets/javascripts/vue_shared/components/web_ide_link.vue
@@ -10,6 +10,21 @@ const KEY_WEB_IDE = 'webide';
 const KEY_GITPOD = 'gitpod';
 const KEY_PIPELINE_EDITOR = 'pipeline_editor';
 
+export const i18n = {
+  modal: {
+    title: __('Enable Gitpod?'),
+    content: s__(
+      'Gitpod|To use Gitpod you must first enable the feature in the integrations section of your %{linkStart}user preferences%{linkEnd}.',
+    ),
+    actionCancelText: __('Cancel'),
+    actionPrimaryText: __('Enable Gitpod'),
+  },
+  webIdeText: s__('WebIDE|Quickly and easily edit multiple files in your project.'),
+  webIdeTooltip: s__(
+    'WebIDE|Quickly and easily edit multiple files in your project. Press . to open',
+  ),
+};
+
 export default {
   components: {
     ActionsButton,
@@ -19,16 +34,7 @@ export default {
     GlLink,
     ConfirmForkModal,
   },
-  i18n: {
-    modal: {
-      title: __('Enable Gitpod?'),
-      content: s__(
-        'Gitpod|To use Gitpod you must first enable the feature in the integrations section of your %{linkStart}user preferences%{linkEnd}.',
-      ),
-      actionCancelText: __('Cancel'),
-      actionPrimaryText: __('Enable Gitpod'),
-    },
-  },
+  i18n,
   props: {
     isFork: {
       type: Boolean,
@@ -207,8 +213,8 @@ export default {
       return {
         key: KEY_WEB_IDE,
         text: this.webIdeActionText,
-        secondaryText: __('Quickly and easily edit multiple files in your project.'),
-        tooltip: '',
+        secondaryText: this.$options.i18n.webIdeText,
+        tooltip: this.$options.i18n.webIdeTooltip,
         attrs: {
           'data-qa-selector': 'web_ide_button',
           'data-track-action': 'click_consolidated_edit_ide',
diff --git a/app/models/oauth_access_token.rb b/app/models/oauth_access_token.rb
index 87e82c04783..7d71e15d3c5 100644
--- a/app/models/oauth_access_token.rb
+++ b/app/models/oauth_access_token.rb
@@ -16,4 +16,14 @@ class OauthAccessToken < Doorkeeper::AccessToken
       super
     end
   end
+
+  # this method overrides a shortcoming upstream, more context:
+  # https://gitlab.com/gitlab-org/gitlab/-/issues/367888
+  def self.find_by_fallback_token(attr, plain_secret)
+    return unless fallback_secret_strategy && fallback_secret_strategy == Doorkeeper::SecretStoring::Plain
+    # token is hashed, don't allow plaintext comparison
+    return if plain_secret.starts_with?("$")
+
+    super
+  end
 end