Merge branch 'revert-9d302b8d' into 'master'

Revert "Merge branch '18297-i-would-like-text-to-wrap-when-in-edit-mode-on-web-app' into 'master'"

## What does this MR do?

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

See merge request !6583

7 files changed, 0 insertions, 117 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 16986281bb8..b806e5e7f80 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,7 +13,6 @@ v 8.13.0 (unreleased)
   - Revoke button in Applications Settings underlines on hover.
   - Update ruby-prof to 0.16.2. !6026 (Elan Ruusamäe)
   - Add organization field to user profile
-  - Added soft wrap option to editor
   - Optimize GitHub importing for speed and memory
 
 v 8.12.2 (unreleased)
diff --git a/app/assets/javascripts/blob_edit/edit_blob.js b/app/assets/javascripts/blob_edit/edit_blob.js
index de6cdd851be..b846bab0424 100644
--- a/app/assets/javascripts/blob_edit/edit_blob.js
+++ b/app/assets/javascripts/blob_edit/edit_blob.js
@@ -22,7 +22,6 @@
       // submitted textarea
       })(this));
       this.initModePanesAndLinks();
-      this.initSoftWrap();
       new BlobLicenseSelectors({
         editor: this.editor
       });
@@ -51,7 +50,6 @@
       this.$editModePanes.hide();
       currentPane.fadeIn(200);
       if (paneId === "#preview") {
-        this.$toggleButton.hide();
         return $.post(currentLink.data("preview-url"), {
           content: this.editor.getValue()
         }, function(response) {
@@ -59,23 +57,10 @@
           return currentPane.syntaxHighlight();
         });
       } else {
-        this.$toggleButton.show();
         return this.editor.focus();
       }
     };
 
-    EditBlob.prototype.initSoftWrap = function() {
-      this.isSoftWrapped = false;
-      this.$toggleButton = $('.soft-wrap-toggle');
-      this.$toggleButton.on('click', this.toggleSoftWrap.bind(this));
-    };
-
-    EditBlob.prototype.toggleSoftWrap = function(e) {
-      this.isSoftWrapped = !this.isSoftWrapped;
-      this.$toggleButton.toggleClass('soft-wrap-active', this.isSoftWrapped);
-      this.editor.getSession().setUseWrapMode(this.isSoftWrapped);
-    };
-
     return EditBlob;
 
   })();
diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss
index 5ea6ce85019..1aa4e06d975 100644
--- a/app/assets/stylesheets/pages/editor.scss
+++ b/app/assets/stylesheets/pages/editor.scss
@@ -59,7 +59,6 @@
   }
 
   .encoding-selector,
-  .soft-wrap-toggle,
   .license-selector,
   .gitignore-selector,
   .gitlab-ci-yml-selector {
@@ -68,26 +67,6 @@
     font-family: $regular_font;
   }
 
-  .soft-wrap-toggle {
-    margin: 0 $btn-side-margin;
-
-    .soft-wrap {
-      display: block;
-    }
-    .no-wrap {
-      display: none;
-    }
-
-    &.soft-wrap-active {
-      .soft-wrap {
-        display: none;
-      }
-      .no-wrap {
-        display: block;
-      }
-    }
-  }
-
   .gitignore-selector, .license-selector, .gitlab-ci-yml-selector {
     .dropdown {
       line-height: 21px;
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml
index d4f59764a70..0237e152b54 100644
--- a/app/views/projects/blob/_editor.html.haml
+++ b/app/views/projects/blob/_editor.html.haml
@@ -21,13 +21,6 @@
         = dropdown_tag("Choose a .gitignore template", options: { toggle_class: 'js-gitignore-selector', title: "Choose a template", filter: true, placeholder: "Filter", data: { data: gitignore_names } } )
       .gitlab-ci-yml-selector.js-gitlab-ci-yml-selector-wrap.hidden
         = dropdown_tag("Choose a GitLab CI Yaml template", options: { toggle_class: 'js-gitlab-ci-yml-selector', title: "Choose a template", filter: true, placeholder: "Filter", data: { data: gitlab_ci_ymls } } )
-      = button_tag class: 'soft-wrap-toggle btn', type: 'button' do
-        %span.no-wrap
-          = custom_icon('icon_no_wrap')
-          No wrap
-        %span.soft-wrap
-          = custom_icon('icon_soft_wrap')
-          Soft wrap
       .encoding-selector
         = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'select2'
 
diff --git a/app/views/shared/icons/_icon_no_wrap.svg b/app/views/shared/icons/_icon_no_wrap.svg
deleted file mode 100644
index fe34cada002..00000000000
--- a/app/views/shared/icons/_icon_no_wrap.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="m6 11h-4.509c-.263 0-.491.226-.491.505v.991c0 .291.22.505.491.505h4.509v.679c0 .301.194.413.454.236l2.355-1.607c.251-.171.259-.442 0-.619l-2.355-1.607c-.251-.171-.454-.07-.454.236v.681m-5-7.495c0-.279.22-.505.498-.505h13c.275 0 .498.214.498.505v.991c0 .279-.22.505-.498.505h-13c-.275 0-.498-.214-.498-.505v-.991m10 8c0-.279.215-.505.49-.505h3.02c.271 0 .49.214.49.505v.991c0 .279-.215.505-.49.505h-3.02c-.271 0-.49-.214-.49-.505v-.991m-10-4c0-.279.22-.505.498-.505h13c.275 0 .498.214.498.505v.991c0 .279-.22.505-.498.505h-13c-.275 0-.498-.214-.498-.505v-.991"/>
-</svg>
diff --git a/app/views/shared/icons/_icon_soft_wrap.svg b/app/views/shared/icons/_icon_soft_wrap.svg
deleted file mode 100644
index ea27a2024b1..00000000000
--- a/app/views/shared/icons/_icon_soft_wrap.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="m12 11h-2v-.681c0-.307-.203-.407-.454-.236l-2.355 1.607c-.259.177-.251.448 0 .619l2.355 1.607c.259.177.454.065.454-.236v-.679h2c0 0 0 0 0 0 1.657 0 3-1.343 3-3 0-.828-.336-1.578-.879-2.121-.543-.543-1.293-.879-2.121-.879-.001 0-.002 0-.002 0h-10.497c-.271 0-.5.226-.5.505v.991c0 .291.224.505.5.505h10.497c.001 0 .002 0 .002 0 .552 0 1 .448 1 1 0 .276-.112.526-.293.707-.181.181-.431.293-.707.293m-11-7.495c0-.279.22-.505.498-.505h13c.275 0 .498.214.498.505v.991c0 .279-.22.505-.498.505h-13c-.275 0-.498-.214-.498-.505v-.991m0 8c0-.279.215-.505.49-.505h3.02c.271 0 .49.214.49.505v.991c0 .279-.215.505-.49.505h-3.02c-.271 0-.49-.214-.49-.505v-.991"/>
-</svg>
diff --git a/spec/features/projects/files/edit_file_soft_wrap_spec.rb b/spec/features/projects/files/edit_file_soft_wrap_spec.rb
deleted file mode 100644
index 7ad90b4a89c..00000000000
--- a/spec/features/projects/files/edit_file_soft_wrap_spec.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-feature 'User uses soft wrap whilst editing file', feature: true, js: true do
-  before do
-    user = create(:user)
-    project = create(:project)
-    project.team << [user, :master]
-    login_as user
-    visit namespace_project_new_blob_path(project.namespace, project, 'master', file_name: 'test_file-name')
-    editor = find('.file-editor.code')
-    editor.click
-    editor.send_keys 'Touch water with paw then recoil in horror chase dog then
-      run away chase the pig around the house eat owner\'s food, and knock
-      dish off table head butt cant eat out of my own dish. Cat is love, cat
-      is life rub face on everything poop on grasses so meow. Playing with
-      balls of wool flee in terror at cucumber discovered on floor run in
-      circles tuxedo cats always looking dapper, but attack dog, run away
-      and pretend to be victim so all of a sudden cat goes crazy, yet chase
-      laser. Make muffins sit in window and stare ooo, a bird! yum lick yarn
-      hanging out of own butt jump off balcony, onto stranger\'s head yet
-      chase laser. Purr for no reason stare at ceiling hola te quiero.'.squish
-  end
-
-  let(:toggle_button) { find('.soft-wrap-toggle') }
-
-  scenario 'user clicks the "No wrap" button and then "Soft wrap" button' do
-    wrapped_content_width = get_content_width
-    toggle_button.click
-    expect(toggle_button).to have_content 'Soft wrap'
-    unwrapped_content_width = get_content_width
-    expect(unwrapped_content_width).to be > wrapped_content_width
-
-    toggle_button.click
-    expect(toggle_button).to have_content 'No wrap'
-    expect(get_content_width).to be < unwrapped_content_width
-  end
-
-  scenario 'user adds a ".js" extension and then changes to a ".md" extension' do
-    wrapped_content_width = get_content_width
-
-    fill_in 'file_name', with: 'test_file-name.js'
-    expect(toggle_button).to have_content 'Soft wrap'
-    unwrapped_content_width = get_content_width
-    expect(unwrapped_content_width).to be > wrapped_content_width
-
-    fill_in 'file_name', with: 'test_file-name.md'
-    expect(toggle_button).to have_content 'No wrap'
-    expect(get_content_width).to be < unwrapped_content_width
-  end
-
-  scenario 'user clicks "No wrap" and then changes to a ".md" extension' do
-    wrapped_content_width = get_content_width
-
-    toggle_button.click
-    expect(toggle_button).to have_content 'Soft wrap'
-    unwrapped_content_width = get_content_width
-    expect(unwrapped_content_width).to be > wrapped_content_width
-
-    fill_in 'file_name', with: 'test_file-name.md'
-    expect(toggle_button).to have_content 'Soft wrap'
-    expect(unwrapped_content_width).to be == get_content_width
-  end
-
-  def get_content_width
-    find('.ace_content')[:style].slice!(/width: \d+/).slice!(/\d+/)
-  end
-end