diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-09-12 07:49:52 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-09-12 07:49:52 +0400 |
| commit | 621affecb59b8ce5304370cfd7979fba2b73ff4e (patch) | |
| tree | 2ff46b99e940d09b79c1929dae7a7ceeb7c02685 /Gemfile | |
| parent | 40eec08c99fe29963afed0f073b7bdbbfe31ac59 (diff) | |
| parent | 0dd94cd86ec0680432e58f2630a3a35fa84afd73 (diff) | |
Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master
Conflicts:
Gemfile.lock
app/helpers/application_helper.rb
app/views/devise/sessions/new.html.erb
db/schema.rb
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -16,6 +16,10 @@ gem "mysql2" # Auth gem "devise", "~> 2.1.0" +gem 'omniauth' +gem 'omniauth-google-oauth2' +gem 'omniauth-twitter' +gem 'omniauth-github' # GITLAB patched libs gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837" |