diff options
| author | pburdette <pburdette@gitlab.com> | 2019-09-04 11:31:22 -0400 |
|---|---|---|
| committer | pburdette <pburdette@gitlab.com> | 2019-09-04 11:31:22 -0400 |
| commit | 5e6d0862bdbfa094547a10a4eda85fb099808dcb (patch) | |
| tree | 1b671ff674a614fd91050ed65e2aca7933dd925f | |
| parent | 2ad749eea8fc552e0c935d3dde325e5a26775592 (diff) | |
| download | gitlab-ce-5e6d0862bdbfa094547a10a4eda85fb099808dcb.tar.gz | |
Move template selectors into editor
| -rw-r--r-- | app/views/projects/blob/_editor.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/blob/_template_selectors.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/blob/new.html.haml | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/app/views/projects/blob/_editor.html.haml b/app/views/projects/blob/_editor.html.haml index 283b845e40d..a74e0d4787c 100644 --- a/app/views/projects/blob/_editor.html.haml +++ b/app/views/projects/blob/_editor.html.haml @@ -17,6 +17,7 @@ \/ = text_field_tag 'file_name', params[:file_name], placeholder: "File name", required: true, class: 'form-control new-file-name js-file-path-name-input' + = render 'template_selectors' .file-buttons - if is_markdown diff --git a/app/views/projects/blob/_template_selectors.html.haml b/app/views/projects/blob/_template_selectors.html.haml index bd46f5a4349..dafc2e71ab7 100644 --- a/app/views/projects/blob/_template_selectors.html.haml +++ b/app/views/projects/blob/_template_selectors.html.haml @@ -1,6 +1,4 @@ .template-selectors-menu - .templates-selectors-label - Template .template-selector-dropdowns-wrap .template-type-selector.js-template-type-selector-wrap.hidden = dropdown_tag("Choose type", options: { toggle_class: 'js-template-type-selector qa-template-type-dropdown', title: "Choose a template type" } ) diff --git a/app/views/projects/blob/new.html.haml b/app/views/projects/blob/new.html.haml index 4be87b9e074..c5e3923f1e8 100644 --- a/app/views/projects/blob/new.html.haml +++ b/app/views/projects/blob/new.html.haml @@ -5,7 +5,6 @@ .editor-title-row %h3.page-title.blob-new-page-title New file - = render 'template_selectors' .file-editor = form_tag(project_create_blob_path(@project, @id), method: :post, class: 'js-edit-blob-form js-new-blob-form js-quick-submit js-requires-input', data: blob_editor_paths(@project)) do = render 'projects/blob/editor', ref: @ref |