diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-03-13 13:47:26 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-03-13 13:47:26 +0100 |
commit | 2718955441587618933a632008b85762247081a2 (patch) | |
tree | d1736e9d19446a47c1e80c2d024925cbb19145c2 | |
parent | 606d24ff2df157ec70003132d1ead7a47dc32883 (diff) | |
download | gitlab-ce-2718955441587618933a632008b85762247081a2.tar.gz |
Fix import pages not working after first load.
-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 97376c85ece..7c7cbb366eb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -61,6 +61,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 |