diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-06-15 20:51:39 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-15 20:51:39 +0200 |
| commit | db200226b805db324a8efdfb951d7725eac3f9da (patch) | |
| tree | a7d8298fc65bbd81e2f843048240de6e4fceffcf /app/views/auth | |
| parent | afceef74c2377192f100b9307068895ec0ec7d45 (diff) | |
| parent | 0df91c7b1e05952ebbfc552915e995d55af0a403 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…
Diffstat (limited to 'app/views/auth')
| -rw-r--r-- | app/views/auth/registrations/new.html.haml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml index 2d4c0f5ac..0fac8e10d 100644 --- a/app/views/auth/registrations/new.html.haml +++ b/app/views/auth/registrations/new.html.haml @@ -7,6 +7,11 @@ = simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| = render 'shared/error_messages', object: resource + - if @invite.present? && @invite.autofollow? + .fields-group{ style: 'margin-bottom: 30px' } + %p.hint{ style: 'text-align: center' }= t('invites.invited_by') + = render 'authorize_follows/card', account: @invite.user.account + = f.simple_fields_for :account do |ff| .input-with-append = ff.input :username, autofocus: true, placeholder: t('simple_form.labels.defaults.username'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username'), :autocomplete => 'off' } |