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

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)

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,31 +50,17 @@
       this.$editModePanes.hide();
       currentPane.fadeIn(200);
       if (paneId === "#preview") {
-        this.$toggleButton.hide();
         return $.post(currentLink.data("preview-url"), {
           content: this.editor.getValue()
         }, function(response) {
           currentPane.empty().append(response);
           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;
 
   })();

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;

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'