diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-01-16 14:21:44 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-01-16 14:21:44 +0100 |
| commit | 4657c28777dfc2729261f895f8e36cbef51395bc (patch) | |
| tree | 86c2483e843be06ad10c0f0b43f6a20da3a5a6b8 /lib/api/users.rb | |
| parent | 5456859b5b28baca95ced74179a349563498a5f0 (diff) | |
| parent | daaaf5ef9f182761ac07d76d24d971765134c7e1 (diff) | |
| download | gitlab-ce-fix/keep-artifacts-button-visibility.tar.gz | |
Merge branch 'master' into fix/keep-artifacts-button-visibilityfix/keep-artifacts-button-visibility
* master: (579 commits)
Conflicts:
spec/models/build_spec.rb
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 0db76ec7877..11a7368b4c0 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -93,7 +93,7 @@ module API # Filter out params which are used later user_params = declared_params(include_missing: false) identity_attrs = user_params.slice(:provider, :extern_uid) - confirm = params.delete(:confirm) + confirm = user_params.delete(:confirm) user = User.new(user_params.except(:extern_uid, :provider)) user.skip_confirmation! unless confirm |