Skip to content

Instantly share code, notes, and snippets.

@rohitarondekar
Created May 13, 2011 16:36
Show Gist options
  • Save rohitarondekar/fa4eb6cc16d0ced1c0c2 to your computer and use it in GitHub Desktop.
Save rohitarondekar/fa4eb6cc16d0ced1c0c2 to your computer and use it in GitHub Desktop.
root@li225-165:~/.goldberg/projects/devise/code# git status
# On branch master
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: Gemfile.lock
#
no changes added to commit (use "git add" and/or "git commit -a")
root@li225-165:~/.goldberg/projects/devise/code# git diff
diff --git a/Gemfile.lock b/Gemfile.lock
index 6b6cb54..b2e5dda 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -32,31 +32,23 @@ GEM
activesupport (= 3.0.7)
arel (~> 2.0.2)
tzinfo (~> 0.3.23)
- activerecord-jdbc-adapter (1.1.1)
- activerecord-jdbcsqlite3-adapter (1.1.1)
- activerecord-jdbc-adapter (= 1.1.1)
- jdbc-sqlite3 (~> 3.6.0)
activeresource (3.0.7)
activemodel (= 3.0.7)
activesupport (= 3.0.7)
activesupport (3.0.7)
- addressable (2.2.4)
+ addressable (2.2.6)
arel (2.0.9)
bcrypt-ruby (2.1.4)
- bcrypt-ruby (2.1.4-java)
- bson (1.3.0)
- bson_ext (1.3.0)
+ bson (1.3.1)
+ bson_ext (1.3.1)
builder (2.1.2)
- columnize (0.3.2)
erubis (2.6.6)
abstract (>= 1.0.0)
- faraday (0.5.7)
+ faraday (0.6.1)
addressable (~> 2.2.4)
multipart-post (~> 1.1.0)
- rack (>= 1.1.0, < 2)
+ rack (< 2, >= 1.1.0)
i18n (0.5.0)
- jdbc-sqlite3 (3.6.14.2.056-java)
- linecache (0.43)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
@@ -64,40 +56,39 @@ GEM
treetop (~> 1.4.8)
mime-types (1.16)
mocha (0.9.12)
- mongo (1.3.0)
- bson (>= 1.3.0)
+ mongo (1.3.1)
+ bson (>= 1.3.1)
mongoid (2.0.1)
activemodel (~> 3.0)
mongo (~> 1.3)
tzinfo (~> 0.3.22)
will_paginate (~> 3.0.pre)
- multi_json (0.0.5)
+ multi_json (1.0.2)
+ multi_xml (0.2.2)
multipart-post (1.1.0)
nokogiri (1.4.4)
- nokogiri (1.4.4-java)
- weakling (>= 0.0.3)
- oa-core (0.2.0)
- rack (~> 1.1)
- oa-oauth (0.2.0)
- multi_json (~> 0.0.2)
- nokogiri (~> 1.4.2)
- oa-core (= 0.2.0)
+ oa-core (0.2.5)
+ oa-oauth (0.2.5)
+ faraday (~> 0.6.1)
+ multi_json (~> 1.0.0)
+ multi_xml (~> 0.2.2)
+ oa-core (= 0.2.5)
oauth (~> 0.4.0)
- oauth2 (~> 0.1.1)
- oa-openid (0.2.0)
- oa-core (= 0.2.0)
- rack-openid (~> 1.2.0)
- ruby-openid-apps-discovery
+ oauth2 (~> 0.4.1)
+ oa-openid (0.2.5)
+ oa-core (= 0.2.5)
+ rack-openid (~> 1.3.1)
+ ruby-openid-apps-discovery (~> 1.2.0)
oauth (0.4.4)
- oauth2 (0.1.1)
- faraday (~> 0.5.0)
- multi_json (~> 0.0.4)
- orm_adapter (0.0.4)
+ oauth2 (0.4.1)
+ faraday (~> 0.6.1)
+ multi_json (>= 0.0.5)
+ orm_adapter (0.0.5)
polyglot (0.3.1)
rack (1.2.2)
rack-mount (0.6.14)
rack (>= 1.0.0)
- rack-openid (1.2.0)
+ rack-openid (1.3.1)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
rack-test (0.5.7)
@@ -116,11 +107,6 @@ GEM
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.8.7)
- ruby-debug (0.10.4)
- columnize (>= 0.1)
- ruby-debug-base (~> 0.10.4.0)
- ruby-debug-base (0.10.4)
- linecache (>= 0.3)
ruby-openid (2.1.8)
ruby-openid-apps-discovery (1.2.0)
ruby-openid (>= 2.1.7)
@@ -131,9 +117,8 @@ GEM
treetop (1.4.9)
polyglot (>= 0.3.1)
tzinfo (0.3.27)
- warden (1.0.3)
- rack (>= 1.0.0)
- weakling (0.0.4-java)
+ warden (1.0.4)
+ rack (>= 1.0)
webrat (0.7.2)
nokogiri (>= 1.2.0)
rack (>= 1.0)
@@ -141,7 +126,6 @@ GEM
will_paginate (3.0.pre2)
PLATFORMS
- java
ruby
DEPENDENCIES
@@ -154,6 +138,5 @@ DEPENDENCIES
oa-oauth (~> 0.2.0)
oa-openid (~> 0.2.0)
rails (~> 3.0.7)
- ruby-debug (>= 0.10.3)
sqlite3-ruby
webrat (= 0.7.2)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment