diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-14 00:31:45 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-14 00:31:45 +0300 |
| commit | 6dbca80c46093443e69f3faace6f1967570b15fa (patch) | |
| tree | d3e351e4ed25c347978f33176c729c0495b7de74 /lib/api/users.rb | |
| parent | 8c058e8563c287817b81a9a122ceeb5a69f6b221 (diff) | |
| parent | 4a8ae77ebac46545fa4811ea60bf53d1e81f10fc (diff) | |
| download | gitlab-ce-remove-comment-toggle.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into remove-comment-toggleremove-comment-toggle
Diffstat (limited to 'lib/api/users.rb')
| -rw-r--r-- | lib/api/users.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index ea6fa2dc8a8..8a376d3c2a3 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -76,7 +76,7 @@ module API required_attributes! [:email, :password, :name, :username] attrs = attributes_for_keys [:email, :name, :password, :skype, :linkedin, :twitter, :projects_limit, :username, :bio, :location, :can_create_group, :admin, :confirm, :external] admin = attrs.delete(:admin) - confirm = !(attrs.delete(:confirm) =~ (/(false|f|no|0)$/i)) + confirm = !(attrs.delete(:confirm) =~ /(false|f|no|0)$/i) user = User.build_user(attrs) user.admin = admin unless admin.nil? user.skip_confirmation! unless confirm |