Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 19 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,21 @@ GEM
factory_girl_rails (4.1.0)
factory_girl (~> 4.1.0)
railties (>= 3.0.0)
faraday (0.8.0)
multipart-post (~> 1.1)
faraday (0.17.0)
multipart-post (>= 1.2, < 3)
haml (3.1.4)
hashie (1.2.0)
hashie (3.6.0)
hike (1.2.1)
httparty (0.8.1)
multi_json
multi_xml
httpauth (0.1)
i18n (0.6.0)
journey (1.0.3)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.7.1)
jwt (2.2.1)
less (2.2.1)
commonjs (~> 0.2.6)
less-rails (2.2.3)
Expand All @@ -92,27 +92,29 @@ GEM
rake
rspec (>= 2.9)
moped (1.2.5)
multi_json (1.3.4)
multi_xml (0.4.2)
multipart-post (1.1.5)
oauth2 (0.6.1)
faraday (~> 0.7)
httpauth (~> 0.1)
multi_json (1.14.1)
multi_xml (0.6.0)
multipart-post (2.1.1)
oauth2 (1.4.2)
faraday (>= 0.8, < 2.0)
jwt (>= 1.0, < 3.0)
multi_json (~> 1.3)
omniauth (1.1.0)
hashie (~> 1.2)
rack
omniauth-oauth2 (1.0.2)
oauth2 (~> 0.6.0)
omniauth (~> 1.0)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.4.2)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
omniauth-oauth2 (1.5.0)
oauth2 (~> 1.1)
omniauth (~> 1.2)
omniauth-singly (0.0.1)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.0)
origin (1.0.9)
orm_adapter (0.4.0)
pg (0.13.2)
polyglot (0.3.3)
rack (1.4.1)
rack (1.4.7)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
Expand Down