diff options
Diffstat (limited to 'app/views/projects/blob/edit.html.haml')
| -rw-r--r-- | app/views/projects/blob/edit.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/blob/edit.html.haml b/app/views/projects/blob/edit.html.haml index f80601ef221..220319d31b5 100644 --- a/app/views/projects/blob/edit.html.haml +++ b/app/views/projects/blob/edit.html.haml @@ -4,7 +4,7 @@ - webpack_preload_asset_tag('monaco') - if @conflict - = render Pajamas::AlertComponent.new(alert_class: 'gl-mb-5 gl-mt-5', + = render Pajamas::AlertComponent.new(alert_options: { class: 'gl-mb-5 gl-mt-5' }, variant: :danger, dismissible: false) do |c| - blob_url = project_blob_path(@project, @id) @@ -15,7 +15,7 @@ = _('Someone edited the file the same time you did. Please check out %{link_start}the file %{icon}%{link_end} and make sure your changes will not unintentionally remove theirs.').html_safe % { link_start: blob_link_start, link_end: '</a>'.html_safe , icon: external_link_icon } -%h3.page-title.blob-edit-page-title +%h1.page-title.gl-font-size-h-display.blob-edit-page-title Edit file .file-editor = gl_tabs_nav({ class: 'js-edit-mode nav-links gl-border-0'}) do |