0
0
Fork 0

Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
This commit is contained in:
Thibaut Girka 2019-04-10 09:16:08 +02:00
commit 5085559b15
89 changed files with 482 additions and 383 deletions

View file

@ -17,7 +17,10 @@ class AboutController < ApplicationController
private
def new_user
User.new.tap(&:build_account)
User.new.tap do |user|
user.build_account
user.build_invite_request
end
end
helper_method :new_user