Merge branch 'remove-ide-pref' into 'master'

Remove IDE option from user preferences

See merge request gitlab-org/gitlab-ce!16454

2 files changed, 0 insertions, 29 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
diff --git a/spec/features/profiles/user_visits_profile_preferences_page_spec.rb b/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
index 266af8f4e3d..90d6841af0e 100644
--- a/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
+++ b/spec/features/profiles/user_visits_profile_preferences_page_spec.rb
@@ -32,18 +32,6 @@ describe 'User visits the profile preferences page' do
     end
   end
 
-  describe 'User changes their multi file editor preferences', :js do
-    it 'set the new_repo cookie when the option is ON' do
-      choose 'user_multi_file_on'
-      expect(get_cookie('new_repo')).not_to be_nil
-    end
-
-    it 'deletes the new_repo cookie when the option is OFF' do
-      choose 'user_multi_file_off'
-      expect(get_cookie('new_repo')).to be_nil
-    end
-  end
-
   describe 'User changes their default dashboard', :js do
     it 'creates a flash message' do
       select 'Starred Projects', from: 'user_dashboard'