diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-15 12:06:12 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-15 12:06:12 +0000 |
| commit | 3fc9a8e6957ddf75576dc63069c4c0249514499f (patch) | |
| tree | 003e30463853843d6fb736a9396c7eb53a3dfc9a /app/views/shared/form_elements | |
| parent | e24153b0cb080b1b25076f8fd358b4273848f2e2 (diff) | |
| download | gitlab-ce-3fc9a8e6957ddf75576dc63069c4c0249514499f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared/form_elements')
| -rw-r--r-- | app/views/shared/form_elements/_description.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/shared/form_elements/_description.html.haml b/app/views/shared/form_elements/_description.html.haml index be78fd0ccfb..9db6184ebca 100644 --- a/app/views/shared/form_elements/_description.html.haml +++ b/app/views/shared/form_elements/_description.html.haml @@ -2,6 +2,7 @@ - model = local_assigns.fetch(:model) - form = local_assigns.fetch(:form) +- placeholder = model.is_a?(MergeRequest) ? _('Describe the goal of the changes and what reviewers should be aware of.') : _('Write a comment or drag your files here…') - supports_quick_actions = model.new_record? - if supports_quick_actions @@ -16,7 +17,7 @@ = render layout: 'projects/md_preview', locals: { url: preview_url, referenced_users: true } do = render 'projects/zen', f: form, attr: :description, classes: 'note-textarea qa-issuable-form-description rspec-issuable-form-description', - placeholder: "Write a comment or drag your files here…", + placeholder: placeholder, supports_quick_actions: supports_quick_actions = render 'shared/notes/hints', supports_quick_actions: supports_quick_actions .clearfix |