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 | |
| 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')
| -rw-r--r-- | Gemfile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -30,6 +30,7 @@ gem 'omniauth-github' gem 'omniauth-shibboleth' gem 'omniauth-kerberos' gem 'omniauth-gitlab' +gem 'omniauth-bitbucket' gem 'doorkeeper', '2.1.0' gem "rack-oauth2", "~> 1.0.5" |