diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-07 10:04:21 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-07 10:04:21 +0300 |
| commit | eebd18c3ac6a77e29693c8e1892782acdf20e262 (patch) | |
| tree | be50fd759672288bbda8694d49c0f8c43563d175 /lib/api/users.rb | |
| parent | 1d749356c30bc18be5805dac7bc49565782ec30d (diff) | |
| parent | bf6961cad85ab9a60f37f9b2974fb7bdd3975810 (diff) | |
Merge branch '2563-backport-ee1942' into 'master'
Backport some EE changes from adding shared_runners_minutes_limit to the API
Closes gitlab-ee#2563
See merge request !11936
Diffstat (limited to 'lib/api/users.rb')
| -rw-r--r-- | lib/api/users.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index 3f87a403a09..dda64715ee1 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -124,10 +124,6 @@ module API optional :name, type: String, desc: 'The name of the user' optional :username, type: String, desc: 'The username of the user' use :optional_attributes - at_least_one_of :email, :password, :name, :username, :skype, :linkedin, - :twitter, :website_url, :organization, :projects_limit, - :extern_uid, :provider, :bio, :location, :admin, - :can_create_group, :confirm, :external end put ":id" do authenticated_as_admin! |