Merge pull request #2991 from raphendyr/username_change_disablation
Add option to disable username changing
This commit is contained in:
commit
e049e18780
5 changed files with 34 additions and 25 deletions
|
@ -51,7 +51,9 @@ class ProfilesController < ApplicationController
|
|||
end
|
||||
|
||||
def update_username
|
||||
if @user.can_change_username?
|
||||
@user.update_attributes(username: params[:user][:username])
|
||||
end
|
||||
|
||||
respond_to do |format|
|
||||
format.js
|
||||
|
|
|
@ -234,6 +234,10 @@ class User < ActiveRecord::Base
|
|||
keys.count == 0
|
||||
end
|
||||
|
||||
def can_change_username?
|
||||
Gitlab.config.gitlab.username_changing_enabled
|
||||
end
|
||||
|
||||
def can_create_project?
|
||||
projects_limit > owned_projects.count
|
||||
end
|
||||
|
|
|
@ -53,7 +53,8 @@
|
|||
|
||||
|
||||
|
||||
%fieldset.update-username
|
||||
- if current_user.can_change_username?
|
||||
%fieldset.update-username
|
||||
%legend
|
||||
Username
|
||||
%small.cred.pull-right
|
||||
|
|
|
@ -35,6 +35,7 @@ production: &base
|
|||
## Project settings
|
||||
default_projects_limit: 10
|
||||
# signup_enabled: true # default: false - Account passwords are not sent via the email if signup is enabled.
|
||||
# username_changing_enabled: false # default: true - User can change her username/namespace
|
||||
|
||||
## Gravatar
|
||||
gravatar:
|
||||
|
|
|
@ -57,6 +57,7 @@ Settings.gitlab['support_email'] ||= Settings.gitlab.email_from
|
|||
Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
|
||||
Settings.gitlab['user'] ||= 'git'
|
||||
Settings.gitlab['signup_enabled'] ||= false
|
||||
Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?
|
||||
|
||||
#
|
||||
# Gravatar
|
||||
|
|
Loading…
Add table
Reference in a new issue