Commit 3735375f authored by Tim Zallmann's avatar Tim Zallmann

Merge branch '41789-fix-up-web-ide-user-preference-copy-and-buttons' into 'master'

Fix up Web IDE user preference copy and buttons

Closes #41789

See merge request gitlab-org/gitlab-ce!16298
parents c90fcf1a 407d5638
app/assets/images/multi-editor-on.png

5.34 KB | W: | H:

app/assets/images/multi-editor-on.png

3.88 KB | W: | H:

app/assets/images/multi-editor-on.png
app/assets/images/multi-editor-on.png
app/assets/images/multi-editor-on.png
app/assets/images/multi-editor-on.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -46,7 +46,7 @@ module BlobHelper ...@@ -46,7 +46,7 @@ module BlobHelper
end end
def ide_edit_text def ide_edit_text
"#{_('Multi Edit')} <span class='label label-primary'>#{_('Beta')}</span>".html_safe "#{_('Web IDE')}"
end end
def ide_blob_link(project = @project, ref = @ref, path = @path, options = {}) def ide_blob_link(project = @project, ref = @ref, path = @path, options = {})
......
...@@ -56,8 +56,6 @@ ...@@ -56,8 +56,6 @@
= link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username } = link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username }
%li %li
= link_to "Settings", profile_path = link_to "Settings", profile_path
%li
= link_to "Turn on multi edit", profile_preferences_path
- if current_user - if current_user
%li %li
= link_to "Help", help_path = link_to "Help", help_path
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
= form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { class: 'row prepend-top-default js-preferences-form' } do |f| = form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { class: 'row prepend-top-default js-preferences-form' } do |f|
.col-lg-4 .col-lg-4
%h4.prepend-top-0 %h4.prepend-top-0
GitLab multi file editor Web IDE (Beta)
%p Unlock an additional editing experience which makes it possible to edit and commit multiple files %p Enable the new web IDE on this device to make it possible to open and edit multiple files with a single commit
.col-lg-8.multi-file-editor-options .col-lg-8.multi-file-editor-options
= label_tag do = label_tag do
.preview.append-bottom-10= image_tag "multi-editor-off.png" .preview.append-bottom-10= image_tag "multi-editor-off.png"
......
---
title: Fix web ide user preferences copy and buttons
merge_request: 41789
author:
type: other
...@@ -14,7 +14,7 @@ feature 'Multi-file editor new directory', :js do ...@@ -14,7 +14,7 @@ feature 'Multi-file editor new directory', :js do
wait_for_requests wait_for_requests
click_link('Multi Edit') click_link('Web IDE')
wait_for_requests wait_for_requests
end end
......
...@@ -14,7 +14,7 @@ feature 'Multi-file editor new file', :js do ...@@ -14,7 +14,7 @@ feature 'Multi-file editor new file', :js do
wait_for_requests wait_for_requests
click_link('Multi Edit') click_link('Web IDE')
wait_for_requests wait_for_requests
end end
......
...@@ -16,7 +16,7 @@ feature 'Multi-file editor upload file', :js do ...@@ -16,7 +16,7 @@ feature 'Multi-file editor upload file', :js do
wait_for_requests wait_for_requests
click_link('Multi Edit') click_link('Web IDE')
wait_for_requests wait_for_requests
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment