diff options
| author | Phil Hughes <me@iamphill.com> | 2019-07-02 19:25:55 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-07-02 19:25:55 +0300 |
| commit | bd279ec06a7d5bc5788edfc31ad32191cf8cc54a (patch) | |
| tree | 9c5281956e7c859fb426bbe71b83f1c148a0c2c7 /app | |
| parent | 24aed2336899d93e9b0aa8ca9b72b5e6d674190f (diff) | |
| parent | d3c29cd22950428e5e46c2d0a0a1aa39615f7cb4 (diff) | |
Merge branch '12537-settings-general' into 'master'
Removes EE differences for app/views/groups/settings/_general.html.haml
Closes gitlab-ee#12537
See merge request gitlab-org/gitlab-ce!30257
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/groups/settings/_general.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/groups/settings/_general.html.haml b/app/views/groups/settings/_general.html.haml index e12748666c8..db1849ebb45 100644 --- a/app/views/groups/settings/_general.html.haml +++ b/app/views/groups/settings/_general.html.haml @@ -13,7 +13,7 @@ = f.text_field :id, class: 'form-control w-auto', readonly: true .row.prepend-top-8 - .form-group.col-md-9.append-bottom-0 + .form-group.col-md-9 = f.label :description, _('Group description (optional)'), class: 'label-bold' = f.text_area :description, class: 'form-control', rows: 3, maxlength: 250 |