diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-18 17:49:32 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-08-18 17:54:07 +0300 |
| commit | 8b1656282bcc39a0c1c7a3dccf74c98b1c3adae2 (patch) | |
| tree | a5375c1ff8150d7777a120f29cfbd4d544ca4865 /app/views/projects/blob/_editor.html.haml | |
| parent | 21a73302e8a8b9f22e51f1707a306f04d3faad07 (diff) | |
| parent | 2c1062f81e3c39cf8a45185c203995a43b91bf65 (diff) | |
Merge branch 'master' into expiration-date-on-memberships
Diffstat (limited to 'app/views/projects/blob/_editor.html.haml')
| -rw-r--r-- | app/views/projects/blob/_editor.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index ff379bafb26..0237e152b54 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -24,7 +24,7 @@ .encoding-selector = select_tag :encoding, options_for_select([ "base64", "text" ], "text"), class: 'select2' - .file-content.code + .file-editor.code %pre.js-edit-mode-pane#editor #{params[:content] || local_assigns[:blob_data]} - if local_assigns[:path] .js-edit-mode-pane#preview.hide |