diff options
| author | ThibG <thib@sitedethib.com> | 2020-02-20 00:52:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-20 00:52:50 +0100 |
| commit | 668098303284b0aa0f1dcfddc280ed1b6fb435bb (patch) | |
| tree | d5b47229d14d496ec48a9f7ad303acdcc5054841 /app/views | |
| parent | 955f838f9df9a6af4ba2ab51716def6093698c28 (diff) | |
| parent | bc4de2f66117b5eac8ebe4a389ad9915c471b0c5 (diff) | |
Merge pull request #1287 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/accounts/show.html.haml | 6 | ||||
| -rw-r--r-- | app/views/auth/registrations/new.html.haml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml index a83f77134..a30b78db2 100644 --- a/app/views/admin/accounts/show.html.haml +++ b/app/views/admin/accounts/show.html.haml @@ -27,9 +27,9 @@ = fa_icon 'check' = Formatter.instance.format_field(account, field.value, custom_emojify: true) - - if account.note.present? - %div - .account__header__content.emojify= Formatter.instance.simplified_format(account, custom_emojify: true) + - if account.note.present? + %div + .account__header__content.emojify= Formatter.instance.simplified_format(account, custom_emojify: true) .dashboard__counters{ style: 'margin-top: 10px' } %div diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml index e807c8d86..bcd66fb8a 100644 --- a/app/views/auth/registrations/new.html.haml +++ b/app/views/auth/registrations/new.html.haml @@ -27,7 +27,7 @@ - if approved_registrations? && !@invite.present? .fields-group - = f.simple_fields_for :invite_request do |invite_request_fields| + = f.simple_fields_for :invite_request, resource.invite_request || resource.build_invite_request do |invite_request_fields| = invite_request_fields.input :text, as: :text, wrapper: :with_block_label, required: false = f.input :invite_code, as: :hidden |