Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/shared/_group_form.html.haml')
-rw-r--r--app/views/shared/_group_form.html.haml3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/shared/_group_form.html.haml b/app/views/shared/_group_form.html.haml
index 89e176bb909..20b667f3921 100644
--- a/app/views/shared/_group_form.html.haml
+++ b/app/views/shared/_group_form.html.haml
@@ -7,7 +7,6 @@
%span Group name
= f.text_field :name, placeholder: 'open-source', class: 'form-control'
-<<<<<<< HEAD
.form-group.col-xs-12
= f.label :path, class: 'label-light' do
%span Group path
@@ -35,6 +34,6 @@
.form-group.col-xs-12
= f.label :description, class: 'label-light' do
Description
- %span.lighter (optional)
+ %span.hint (optional)
= f.text_area :description, maxlength: 250,
class: 'form-control js-gfm-input', rows: 4