summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-01-18 16:05:08 +0000
committerTim Zallmann <tzallmann@gitlab.com>2018-01-18 16:05:08 +0000
commite56bcf92774b19115f62b609163c44ba9d919e69 (patch)
tree9c1fff2a36968ed0932801caa0e76292044f0d5b /app
parentde71a0646abded0c3536f93309bc4ecccd92f9e9 (diff)
parent18abb3034209525a7e9a9a98d92ae5a168a97251 (diff)
downloadgitlab-ce-e56bcf92774b19115f62b609163c44ba9d919e69.tar.gz
Merge branch 'remove-ide-pref' into 'master'
Remove IDE option from user preferences See merge request gitlab-org/gitlab-ce!16454
Diffstat (limited to 'app')
-rw-r--r--app/views/profiles/preferences/show.html.haml17
1 files changed, 0 insertions, 17 deletions
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index aeae7455a1c..66d1d1e8d44 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -3,23 +3,6 @@
= render 'profiles/head'
= 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
- 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"
- = f.radio_button :multi_file, "off", checked: true
- Off
- = label_tag do
- .preview.append-bottom-10= image_tag "multi-editor-on.png"
- = f.radio_button :multi_file, "on", checked: false
- On
-
- .col-sm-12
- %hr
-
.col-lg-4.application-theme
%h4.prepend-top-0
GitLab navigation theme