diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-25 09:21:45 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-25 09:21:45 -0800 |
| commit | a52529f9b6258b2ae2793930096c3fcbe40078f3 (patch) | |
| tree | fc28baed1a41a50892215c94ccee3f2eddf9772c /Gemfile.lock | |
| parent | 7475f4f00d999a603eb01a0b70a966db1cd243d8 (diff) | |
| parent | 56f51bed6b166f12b8b0f4f1bd883142c5e079a6 (diff) | |
| download | gitlab-ce-a52529f9b6258b2ae2793930096c3fcbe40078f3.tar.gz | |
Merge branch 'bitbucket-import'
Conflicts:
app/views/import/gitorious/status.html.haml
db/schema.rb
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e4d43bb56b3..6949d14b185 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -338,6 +338,10 @@ GEM omniauth (1.1.4) hashie (>= 1.2, < 3) rack + omniauth-bitbucket (0.0.2) + multi_json (~> 1.7) + omniauth (~> 1.1) + omniauth-oauth (~> 1.0) omniauth-github (1.1.1) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) @@ -701,6 +705,7 @@ DEPENDENCIES nprogress-rails octokit (= 3.7.0) omniauth (~> 1.1.3) + omniauth-bitbucket omniauth-github omniauth-gitlab omniauth-google-oauth2 |