deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updated gems: omniauth, sinatra, foreman

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-02 12:58:47 +02:00
parent 1cfc2b6fc7
commit 86da625f1d
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -16,7 +16,7 @@ gem "pg", group: :postgres
# Auth # Auth
gem "devise" gem "devise"
gem 'omniauth', "~> 1.1.1" gem 'omniauth', "~> 1.1.3"
gem 'omniauth-google-oauth2' gem 'omniauth-google-oauth2'
gem 'omniauth-twitter' gem 'omniauth-twitter'
gem 'omniauth-github' gem 'omniauth-github'

22
Gemfile.lock
View file

@ -155,7 +155,7 @@ GEM
factory_girl_rails (4.1.0) factory_girl_rails (4.1.0)
factory_girl (~> 4.1.0) factory_girl (~> 4.1.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faraday (0.8.4) faraday (0.8.6)
multipart-post (~> 1.1) multipart-post (~> 1.1)
faye-websocket (0.4.7) faye-websocket (0.4.7)
eventmachine (>= 0.12.0) eventmachine (>= 0.12.0)
@ -164,7 +164,7 @@ GEM
font-awesome-sass-rails (3.0.0.1) font-awesome-sass-rails (3.0.0.1)
railties (>= 3.1.1) railties (>= 3.1.1)
sass-rails (>= 3.1.1) sass-rails (>= 3.1.1)
foreman (0.60.2) foreman (0.61.0)
thor (>= 0.13.6) thor (>= 0.13.6)
gemoji (1.2.1) gemoji (1.2.1)
gherkin-ruby (0.2.1) gherkin-ruby (0.2.1)
@ -255,21 +255,21 @@ GEM
sprockets (~> 2.0) sprockets (~> 2.0)
multi_json (1.6.1) multi_json (1.6.1)
multi_xml (0.5.3) multi_xml (0.5.3)
multipart-post (1.1.5) multipart-post (1.2.0)
mysql2 (0.3.11) mysql2 (0.3.11)
net-ldap (0.2.2) net-ldap (0.2.2)
nokogiri (1.5.6) nokogiri (1.5.6)
oauth (0.4.7) oauth (0.4.7)
oauth2 (0.8.0) oauth2 (0.8.1)
faraday (~> 0.8) faraday (~> 0.8)
httpauth (~> 0.1) httpauth (~> 0.1)
jwt (~> 0.1.4) jwt (~> 0.1.4)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.2) rack (~> 1.2)
omniauth (1.1.1) omniauth (1.1.3)
hashie (~> 1.2) hashie (~> 1.2)
rack rack
omniauth-github (1.0.3) omniauth-github (1.1.0)
omniauth (~> 1.0) omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1) omniauth-oauth2 (~> 1.1)
omniauth-google-oauth2 (0.1.13) omniauth-google-oauth2 (0.1.13)
@ -309,7 +309,7 @@ GEM
rack (>= 1.1.3) rack (>= 1.1.3)
rack-mount (0.8.3) rack-mount (0.8.3)
rack (>= 1.0.0) rack (>= 1.0.0)
rack-protection (1.3.2) rack-protection (1.4.0)
rack rack
rack-ssl (1.3.3) rack-ssl (1.3.3)
rack rack
@ -400,9 +400,9 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
simplecov-html (~> 0.7.1) simplecov-html (~> 0.7.1)
simplecov-html (0.7.1) simplecov-html (0.7.1)
sinatra (1.3.3) sinatra (1.3.5)
rack (~> 1.3, >= 1.3.6) rack (~> 1.4)
rack-protection (~> 1.2) rack-protection (~> 1.3)
tilt (~> 1.3, >= 1.3.3) tilt (~> 1.3, >= 1.3.3)
six (0.2.0) six (0.2.0)
slim (1.3.6) slim (1.3.6)
@ -508,7 +508,7 @@ DEPENDENCIES
letter_opener letter_opener
modernizr (= 2.6.2) modernizr (= 2.6.2)
mysql2 mysql2
omniauth (~> 1.1.1) omniauth (~> 1.1.3)
omniauth-github omniauth-github
omniauth-google-oauth2 omniauth-google-oauth2
omniauth-twitter omniauth-twitter