diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-10-01 00:58:50 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-01 00:58:50 +0300 |
commit | fc6ae3fb583390b9955d1fc569168535925093cb (patch) | |
tree | 700869392db43b9d959fb8c889fecb0b51dd9f2c /spec/features/expand_collapse_diffs_spec.rb | |
parent | f4d4113240e6851fd8eede1170a60c06b22578e1 (diff) | |
parent | 70f7d2446a4ba9e301d0f7151a95a52e127f2423 (diff) |
Merge branch '18297-i-would-like-text-to-wrap-when-in-edit-mode-on-web-app' into 'master'
Added soft wrap option to editor (attempt 2 after killing master)
Previously !6188.
## What does this MR do?
Adds a `Soft wrap` button to the editor, when clicked, it wraps the text in the editor and changes to `No wrap`, then when clicked, it unwraps the text in the editor.
## Are there points in the code the reviewer needs to double check?
Let's make sure we dont blow up `master` this time. :fearful: :laughing:
## Why was this MR needed?
## Screenshots (if relevant)
https://youtu.be/8LW5nQsraSM
#### No wrap
![Screen_Shot_2016-09-02_at_19.54.54](/uploads/97f2d1b2d415d03fe1b0be0640ab12e0/Screen_Shot_2016-09-02_at_19.54.54.png)
#### Soft wrap
![Screen_Shot_2016-09-02_at_19.54.45](/uploads/5af425587ce7198e015cce58440971b9/Screen_Shot_2016-09-02_at_19.54.45.png)
## 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?
Closes #18297
See merge request !6594
Diffstat (limited to 'spec/features/expand_collapse_diffs_spec.rb')
0 files changed, 0 insertions, 0 deletions