Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

mastodon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

47e507fa

Unverified Commit 47e507fa authored 4 years ago by ThibG Committed by GitHub 4 years ago

Downloads
- Patches
- Plain Diff

Add ability to require invite request text (#15326)


Fixes #15273

Co-authored-by: Claire <claire.github-309c@sitedethib.com>

parent a7e819b8

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/javascript/packs/admin.js 26 additions, 0 deletions

app/javascript/packs/admin.js
app/javascript/styles/mastodon/forms.scss 10 additions, 5 deletions

app/javascript/styles/mastodon/forms.scss
app/models/form/admin_settings.rb 2 additions, 0 deletions

app/models/form/admin_settings.rb
app/models/user.rb 2 additions, 1 deletion

app/models/user.rb
app/views/about/_registration.html.haml 1 addition, 1 deletion

app/views/about/_registration.html.haml
app/views/admin/settings/edit.html.haml 6 additions, 0 deletions

app/views/admin/settings/edit.html.haml
app/views/auth/registrations/new.html.haml 1 addition, 1 deletion

app/views/auth/registrations/new.html.haml
config/locales/en.yml 3 additions, 0 deletions

config/locales/en.yml
config/settings.yml 1 addition, 0 deletions

config/settings.yml

with 52 additions and 8 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment