Merge branch 'fix/rmistry-339782-27022022' into 'master'

Change Edit to Open in Blob view to maintain consistency

See merge request gitlab-org/gitlab!81759

app/assets/javascripts/vue_shared/components/web_ide_link.vue

@@ -178,7 +178,7 @@ export default {
       if (this.webIdeText) {
         return this.webIdeText;
       } else if (this.isBlob) {
-        return __('Edit in Web IDE');
+        return __('Open in Web IDE');
       } else if (this.isFork) {
         return __('Edit fork in Web IDE');
       }
@@ -218,6 +218,9 @@ export default {
       };
     },
     gitpodActionText() {
+      if (this.isBlob) {
+        return __('Open in Gitpod');
+      }
       return this.gitpodText || __('Gitpod');
     },
     computedShowGitpodButton() {
@@ -247,7 +250,6 @@ export default {
       if (!this.computedShowGitpodButton) {
         return null;
       }
-
       const handleOptions = this.gitpodEnabled
         ? { href: this.gitpodUrl }
         : {

locale/gitlab.pot

@@ -25668,6 +25668,9 @@ msgstr ""
 msgid "Open errors"
 msgstr ""
 
+msgid "Open in Gitpod"
+msgstr ""
+
 msgid "Open in Web IDE"
 msgstr ""
 

spec/features/projects/files/user_browses_lfs_files_spec.rb

@@ -72,7 +72,7 @@ RSpec.describe 'Projects > Files > User browses LFS files' do
         expect(page).not_to have_content('Blame')
 
         expect(page).not_to have_selector(:link_or_button, text: /^Edit$/)
-        expect(page).to have_selector(:link_or_button, 'Edit in Web IDE')
+        expect(page).to have_selector(:link_or_button, 'Open in Web IDE')
       end
     end
   end