summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-06-20 10:47:06 +0000
committerDouwe Maan <douwe@gitlab.com>2015-06-20 10:47:06 +0000
commitc0df5ff126f3a2643ce804e85f09567709eec085 (patch)
treea2ed64d9b3f285fe127182174132c88138361112 /app/views
parent473fb23afc515b808c8687d17ead10cd7979082c (diff)
parentaecc989154ccb3cf044cff0341c0b7c195a9a572 (diff)
downloadgitlab-ce-c0df5ff126f3a2643ce804e85f09567709eec085.tar.gz
Merge branch 'snippet_optional_filename' into 'master'
Make snippet filename optional. Fixes #2384. See merge request !1866
Diffstat (limited to 'app/views')
-rw-r--r--app/views/shared/snippets/_form.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/snippets/_form.html.haml b/app/views/shared/snippets/_form.html.haml
index fe25133abb0..913b6744844 100644
--- a/app/views/shared/snippets/_form.html.haml
+++ b/app/views/shared/snippets/_form.html.haml
@@ -18,7 +18,7 @@
.col-sm-10
.file-holder.snippet
.file-title
- = f.text_field :file_name, placeholder: "example.rb", class: 'form-control snippet-file-name', required: true
+ = 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'
.file-content.code
%pre#editor= @snippet.content
= f.hidden_field :content, class: 'snippet-file-content'