Merge branch 'import-options-dup' into 'master'

Fix import pages not working after first load.

Fixes #2102.

`OAuth2::Client` was deleting keys from the options hash in place, which made it incomplete the next time the import page was loaded. We dup it so this no longer happens.

See merge request !1691

CHANGELOG

@@ -62,6 +62,7 @@ v 7.9.0 (unreleased)
   - Allow smb:// links in Markdown text.
   - Filter merge request by title or description at Merge Requests page
   - Block user if he/she was blocked in Active Directory
+  - Fix import pages not working after first load.
 
 v 7.8.4
   - Fix issue_tracker_id substitution in custom issue trackers

lib/gitlab/bitbucket_import/client.rb

@@ -92,7 +92,7 @@ module Gitlab
       end
 
       def bitbucket_options
-        OmniAuth::Strategies::Bitbucket.default_options[:client_options]
+        OmniAuth::Strategies::Bitbucket.default_options[:client_options].dup
       end
     end
   end

lib/gitlab/github_import/client.rb

@@ -46,7 +46,7 @@ module Gitlab
       end
 
       def github_options
-        OmniAuth::Strategies::GitHub.default_options[:client_options]
+        OmniAuth::Strategies::GitHub.default_options[:client_options].dup
       end
     end
   end

lib/gitlab/gitlab_import/client.rb

@@ -71,7 +71,7 @@ module Gitlab
       end
 
       def gitlab_options
-        OmniAuth::Strategies::GitLab.default_options[:client_options]
+        OmniAuth::Strategies::GitLab.default_options[:client_options].dup
       end
     end
   end