diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 13:04:38 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 13:04:38 +0200 |
| commit | 9d029a05f1a6e35228bfb094ad2bd8369b7ee45f (patch) | |
| tree | 7620301fa2fdf6af222716d54525f6d1ce4e2d03 /app/views/projects/blob | |
| parent | 40b1703263bbeb35e54d21c8f0c2a575d6965a9f (diff) | |
| download | gitlab-ce-9d029a05f1a6e35228bfb094ad2bd8369b7ee45f.tar.gz | |
Revert "Merge branch 'web-editor-rugged' into 'master'"
This reverts commit 5a1aa49b5533593dc4c6de82279fe44f5f15616c, reversing
changes made to a675bea2c1c1d5d6923cb97b8714eb72d4e4ff9b.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects/blob')
| -rw-r--r-- | app/views/projects/blob/_editor.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 9c3e1703c89..96f188e4aa7 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -12,8 +12,8 @@ \/ = text_field_tag 'file_name', params[:file_name], placeholder: "File name", required: true, class: 'form-control new-file-name' - .pull-right - = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'form-control' + .pull-right + = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'form-control' .file-content.code %pre.js-edit-mode-pane#editor |