diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-09-16 19:41:15 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-13 14:16:34 -0500 |
| commit | a3eb39a1068df93d732585272c5eaff380801430 (patch) | |
| tree | 7ec0263041316dbf37e8638ecd9fd79ec2dbe1c7 /app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml | |
| parent | 26f658decd3943bbc66c567ea91e7b859b32e0e6 (diff) | |
| download | gitlab-ce-a3eb39a1068df93d732585272c5eaff380801430.tar.gz | |
Replace textarea with Ace editor
Diffstat (limited to 'app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml b/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml index 0556341fd64..940558e02e0 100644 --- a/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml +++ b/app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml @@ -3,4 +3,4 @@ .editor-wrap{ ":class" => "classObject" } %p.loading-text Loading... .editor - %textarea{ "@input" => "onInput", cols: '80', rows: '20' } + %pre{ "style" => "height: 350px" } |