diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-23 02:33:45 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-23 02:33:45 +0000 |
| commit | e9b00588364b01dd9020f90e56c8252e306f0a53 (patch) | |
| tree | d6159107f168a25bb737903c214e106321cf7cab /spec/tasks | |
| parent | fb30039668f68834d9951746181201423fa8b269 (diff) | |
| parent | 5cce0645b07265e3c2b991bcbff351a9acbc90d6 (diff) | |
| download | gitlab-ce-e9b00588364b01dd9020f90e56c8252e306f0a53.tar.gz | |
Merge branch 'fix-broken-new-project-import' into 'master'
Fix OAuth2 issue importing a new project from GitHub and GitLab
It appears that the GitLab OAuth2 client options were converted to strings instead of symbols when merged with the default options (i.e. `{}.merge(github_options)`). As a result, the OAuth2 defaults were being used. For example, the OAuth2 client options would have a key with `authorize_url` and `:authorize_url`, but the former was never used. As a result, the OAuth2 client would always use the wrong URL to talk to GitHub.
Note that this bug should also have affected GitLab, but not Bitbucket: The OAuth client is careful to convert all keys to symbols.
Closes #1268
See merge request !425
Diffstat (limited to 'spec/tasks')
0 files changed, 0 insertions, 0 deletions