diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-01-11 11:25:20 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-01-15 22:17:28 +0300 |
| commit | 2fa478710d44fb06ff76454bcc8690a3aea6865f (patch) | |
| tree | 19b46dccac1f3302492387b69b932137df8b4e66 /app/views | |
| parent | d368a2d676f95ceaabb4854198be9d23b6a4f2e1 (diff) | |
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
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 | ||||
| -rw-r--r-- | app/views/profiles/preferences/show.html.haml | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 39eb71c2bac..99e7f3b568d 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -56,8 +56,6 @@ = link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username } %li = link_to "Settings", profile_path - %li - = link_to "Turn on multi edit", profile_preferences_path - if current_user %li = link_to "Help", help_path diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml index 65328791ce5..aeae7455a1c 100644 --- a/app/views/profiles/preferences/show.html.haml +++ b/app/views/profiles/preferences/show.html.haml @@ -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| .col-lg-4 %h4.prepend-top-0 - GitLab multi file editor - %p Unlock an additional editing experience which makes it possible to edit and commit multiple files + Web IDE (Beta) + %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 = label_tag do .preview.append-bottom-10= image_tag "multi-editor-off.png" |