Move username change decision into user model

4-1-stable
Jaakko Kantojärvi 2013-02-02 21:25:03 +02:00
parent de7012c4fb
commit fcffb4c381
3 changed files with 6 additions and 2 deletions

View File

@ -51,7 +51,7 @@ class ProfilesController < ApplicationController
end
def update_username
if Gitlab.config.gitlab.username_changing_enabled
if @user.can_change_username?
@user.update_attributes(username: params[:user][:username])
end

View File

@ -215,6 +215,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 > personal_projects.count
end

View File

@ -53,7 +53,7 @@
- if Gitlab.config.gitlab.username_changing_enabled
- if current_user.can_change_username?
%fieldset.update-username
%legend
Username