diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2018-03-09 12:36:26 -0300 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-03-09 12:36:26 -0300 |
| commit | 5596933b535d632cf3c8159889a72b1e98e4ec0a (patch) | |
| tree | 5edc39c0408a1e5bcbc13168dedbdabd1eba417f /lib/bitbucket/connection.rb | |
| parent | da5694c5cbaf62d5568339efd1a6f340f97e6e53 (diff) | |
| parent | 3bbe60f8e802ce3d9da060a47b7f635dedba7370 (diff) | |
| download | gitlab-ce-docs-refactor-dev-guides.tar.gz | |
fix conflictdocs-refactor-dev-guides
Diffstat (limited to 'lib/bitbucket/connection.rb')
| -rw-r--r-- | lib/bitbucket/connection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bitbucket/connection.rb b/lib/bitbucket/connection.rb index b9279c33f5b..ba5a9e2f04c 100644 --- a/lib/bitbucket/connection.rb +++ b/lib/bitbucket/connection.rb @@ -57,7 +57,7 @@ module Bitbucket end def provider - Gitlab::OAuth::Provider.config_for('bitbucket') + Gitlab::Auth::OAuth::Provider.config_for('bitbucket') end def options |