diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-13 15:35:40 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-13 15:35:40 +0000 |
| commit | 823e5457d01037d09932d7b91069ad2e28a36af0 (patch) | |
| tree | 27ea1e16faf598f7b9130ac09f0a13e64755b81f | |
| parent | 2b0f9f93758b5275b98236059f147590234f5a59 (diff) | |
| parent | 2718955441587618933a632008b85762247081a2 (diff) | |
| download | gitlab-ce-823e5457d01037d09932d7b91069ad2e28a36af0.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/gitlab/bitbucket_import/client.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/github_import/client.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/gitlab_import/client.rb | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index a2e139eca33..e7a9218d7ac 100644 --- a/CHANGELOG +++ b/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 diff --git a/lib/gitlab/bitbucket_import/client.rb b/lib/gitlab/bitbucket_import/client.rb index c907bebaef6..1e4906c9e31 100644 --- a/lib/gitlab/bitbucket_import/client.rb +++ b/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 diff --git a/lib/gitlab/github_import/client.rb b/lib/gitlab/github_import/client.rb index 676d226bddd..7fe076b333b 100644 --- a/lib/gitlab/github_import/client.rb +++ b/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 diff --git a/lib/gitlab/gitlab_import/client.rb b/lib/gitlab/gitlab_import/client.rb index ecf4ff94e39..2236439c6ce 100644 --- a/lib/gitlab/gitlab_import/client.rb +++ b/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 |