diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-16 18:06:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-16 18:06:26 +0300 |
| commit | 84727c8209a4412e21111a07f99b0438b03232de (patch) | |
| tree | 1fcfa02b01548c3cdc561186870a1c807f227f0b /app/views | |
| parent | d2798d607e11e0ebae83ae909404834388733428 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/shared/snippets/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/snippets/_header.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/snippets/_form.html.haml b/app/views/shared/snippets/_form.html.haml index 2d2382e469a..73401029da4 100644 --- a/app/views/shared/snippets/_form.html.haml +++ b/app/views/shared/snippets/_form.html.haml @@ -22,7 +22,7 @@ = f.label :file_name, "File" .col-sm-10 .file-holder.snippet - .js-file-title.file-title + .js-file-title.file-title-flex-parent = f.text_field :file_name, placeholder: "Optionally name this file to add code highlighting, e.g. example.rb for Ruby.", class: 'form-control snippet-file-name qa-snippet-file-name' .file-content.code %pre#editor= @snippet.content diff --git a/app/views/shared/snippets/_header.html.haml b/app/views/shared/snippets/_header.html.haml index 1a9ae68f53d..69481293f90 100644 --- a/app/views/shared/snippets/_header.html.haml +++ b/app/views/shared/snippets/_header.html.haml @@ -28,7 +28,7 @@ = @snippet.description - if @snippet.updated_at != @snippet.created_at - = edited_time_ago_with_tooltip(@snippet, placement: 'bottom', html_class: 'snippet-edited-ago', exclude_author: true) + = edited_time_ago_with_tooltip(@snippet, placement: 'bottom', exclude_author: true) - if @snippet.embeddable? .embed-snippet |