diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-21 17:50:22 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 09:31:57 -0600 |
| commit | 030baf70d25a666b660b0024f000586631ee3daf (patch) | |
| tree | 20dbdbb674e9a4fd0ad6d82161e34fd26aaf37cd /lib | |
| parent | c5a49cc3c56283ae5f015c808327b1a29ca09ed9 (diff) | |
| download | gitlab-ce-030baf70d25a666b660b0024f000586631ee3daf.tar.gz | |
Enable Performance/RedundantMerge
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/users.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/github_import/importer.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index fbc17953691..94b2b6653d2 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -172,7 +172,7 @@ module API end end - user_params.merge!(password_expires_at: Time.now) if user_params[:password].present? + user_params[:password_expires_at] = Time.now if user_params[:password].present? if user.update_attributes(user_params.except(:extern_uid, :provider)) present user, with: Entities::UserPublic diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb index a631425b3cf..a160869541a 100644 --- a/lib/gitlab/github_import/importer.rb +++ b/lib/gitlab/github_import/importer.rb @@ -285,7 +285,7 @@ module Gitlab def fetch_resources(resource_type, *opts) return if imported?(resource_type) - opts.last.merge!(page: current_page(resource_type)) + opts.last[:page] = current_page(resource_type) client.public_send(resource_type, *opts) do |resources| yield resources |