mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
DEV: Apply syntax_tree formatting to lib/*
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
require 'rails'
|
||||
require 'highline/import'
|
||||
require "rails"
|
||||
require "highline/import"
|
||||
|
||||
module DiscourseDev
|
||||
class Config
|
||||
@@ -63,10 +63,11 @@ module DiscourseDev
|
||||
if settings.present?
|
||||
email = settings[:email] || "new_user@example.com"
|
||||
|
||||
new_user = ::User.create!(
|
||||
email: email,
|
||||
username: settings[:username] || UserNameSuggester.suggest(email)
|
||||
)
|
||||
new_user =
|
||||
::User.create!(
|
||||
email: email,
|
||||
username: settings[:username] || UserNameSuggester.suggest(email),
|
||||
)
|
||||
new_user.email_tokens.update_all confirmed: true
|
||||
new_user.activate
|
||||
end
|
||||
@@ -88,15 +89,14 @@ module DiscourseDev
|
||||
def create_admin_user_from_settings(settings)
|
||||
email = settings[:email]
|
||||
|
||||
admin = ::User.with_email(email).first_or_create!(
|
||||
email: email,
|
||||
username: settings[:username] || UserNameSuggester.suggest(email),
|
||||
password: settings[:password]
|
||||
)
|
||||
admin =
|
||||
::User.with_email(email).first_or_create!(
|
||||
email: email,
|
||||
username: settings[:username] || UserNameSuggester.suggest(email),
|
||||
password: settings[:password],
|
||||
)
|
||||
admin.grant_admin!
|
||||
if admin.trust_level < 1
|
||||
admin.change_trust_level!(1)
|
||||
end
|
||||
admin.change_trust_level!(1) if admin.trust_level < 1
|
||||
admin.email_tokens.update_all confirmed: true
|
||||
admin.activate
|
||||
end
|
||||
@@ -107,10 +107,7 @@ module DiscourseDev
|
||||
password = ask("Password (optional, press ENTER to skip): ")
|
||||
username = UserNameSuggester.suggest(email)
|
||||
|
||||
admin = ::User.new(
|
||||
email: email,
|
||||
username: username
|
||||
)
|
||||
admin = ::User.new(email: email, username: username)
|
||||
|
||||
if password.present?
|
||||
admin.password = password
|
||||
@@ -122,7 +119,7 @@ module DiscourseDev
|
||||
saved = admin.save
|
||||
|
||||
if saved
|
||||
File.open(file_path, 'a') do | file|
|
||||
File.open(file_path, "a") do |file|
|
||||
file.puts("admin:")
|
||||
file.puts(" username: #{admin.username}")
|
||||
file.puts(" email: #{admin.email}")
|
||||
@@ -137,9 +134,7 @@ module DiscourseDev
|
||||
admin.save
|
||||
|
||||
admin.grant_admin!
|
||||
if admin.trust_level < 1
|
||||
admin.change_trust_level!(1)
|
||||
end
|
||||
admin.change_trust_level!(1) if admin.trust_level < 1
|
||||
admin.email_tokens.update_all confirmed: true
|
||||
admin.activate
|
||||
|
||||
|
||||
Reference in New Issue
Block a user