From: David Yip <yipdw@member.fsf.org>
Date: Mon, 27 Nov 2017 17:29:04 +0000 (-0600)
Subject: Merge remote-tracking branch 'origin/master' into gs-master
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e77c3996a513a45e5cad368b0053459f303c60cb;p=mastodon.git

Merge remote-tracking branch 'origin/master' into gs-master
---

e77c3996a513a45e5cad368b0053459f303c60cb
diff --cc config/locales/en.yml
index 627f2a918,36b6981cb..198bd0411
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -424,14 -429,25 +429,33 @@@ en
        muting: Muting list
      upload: Upload
    in_memoriam_html: In Memoriam.
 +  keyword_mutes:
 +    add_keyword: Add keyword
 +    edit: Edit
 +    edit_keyword: Edit keyword
 +    keyword: Keyword
 +    match_whole_word: Match whole word
 +    remove: Remove
 +    remove_all: Remove all
+   invites:
+     delete: Delete
+     expires_in:
+       '1800': 30 minutes
+       '21600': 6 hours
+       '3600': 1 hour
+       '43200': 12 hours
+       '86400': 1 day
+     expires_in_prompt: Never
+     generate: Generate
+     max_uses:
+       one: 1 use
+       other: "%{count} uses"
+     max_uses_prompt: No limit
+     prompt: Generate and share links with others to grant access to this instance
+     table:
+       expires_at: Expires
+       uses: Uses
+     title: Invite people
    landing_strip_html: "<strong>%{name}</strong> is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse."
    landing_strip_signup_html: If you don't, you can <a href="%{sign_up_path}">sign up here</a>.
    media_attachments:
diff --cc config/settings.yml
index 670a992bb,f03a32e50..01478972c
--- a/config/settings.yml
+++ b/config/settings.yml
@@@ -16,7 -16,8 +16,8 @@@ defaults: &default
    open_registrations: true
    closed_registrations_message: ''
    open_deletion: true
 +  timeline_preview: false
+   min_invite_role: 'admin'
 -  timeline_preview: true
    show_staff_badge: true
    default_sensitive: false
    unfollow_modal: false
diff --cc db/schema.rb
index 5bce18271,7422bd127..f4da922d2
--- a/db/schema.rb
+++ b/db/schema.rb
@@@ -523,8 -525,8 +536,9 @@@ ActiveRecord::Schema.define(version: 20
    add_foreign_key "follow_requests", "accounts", name: "fk_76d644b0e7", on_delete: :cascade
    add_foreign_key "follows", "accounts", column: "target_account_id", name: "fk_745ca29eac", on_delete: :cascade
    add_foreign_key "follows", "accounts", name: "fk_32ed1b5560", on_delete: :cascade
 +  add_foreign_key "glitch_keyword_mutes", "accounts", on_delete: :cascade
    add_foreign_key "imports", "accounts", name: "fk_6db1b6e408", on_delete: :cascade
+   add_foreign_key "invites", "users", on_delete: :cascade
    add_foreign_key "list_accounts", "accounts", on_delete: :cascade
    add_foreign_key "list_accounts", "follows", on_delete: :cascade
    add_foreign_key "list_accounts", "lists", on_delete: :cascade