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
34 changes: 18 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@ GEM
multi_json (~> 1.0)
arel (2.2.1)
bcrypt-ruby (3.0.1)
builder (3.0.0)
builder (3.0.4)
coffee-rails (3.1.1)
coffee-script (>= 2.2.0)
railties (~> 3.1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.1.2)
concurrent-ruby (1.1.5)
erubis (2.7.0)
execjs (1.2.9)
multi_json (~> 1.0)
Expand All @@ -47,11 +48,12 @@ GEM
factory_girl_rails (1.2.0)
factory_girl (~> 2.1.0)
railties (>= 3.0.0)
hike (1.2.1)
i18n (0.6.0)
jquery-rails (1.0.16)
railties (~> 3.0)
thor (~> 0.14)
hike (1.2.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jquery-rails (3.1.3)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.6.1)
libv8 (3.3.10.2)
mail (2.3.0)
Expand All @@ -62,16 +64,16 @@ GEM
money (4.0.1)
i18n (~> 0.4)
json
multi_json (1.0.3)
multi_json (1.14.0)
polyglot (0.3.3)
rack (1.3.5)
rack-cache (1.1)
rack (1.3.10)
rack-cache (1.9.0)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack-ssl (1.3.4)
rack
rack-test (0.6.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (3.1.1)
actionmailer (= 3.1.1)
Expand All @@ -88,8 +90,8 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
rdoc (3.11)
rake (13.0.0)
rdoc (3.12.2)
json (~> 1.4)
sass (3.1.10)
sass-rails (3.1.4)
Expand All @@ -98,15 +100,15 @@ GEM
sass (>= 3.1.4)
sprockets (~> 2.0.0)
tilt (~> 1.3.2)
sprockets (2.0.3)
sprockets (2.0.5)
hike (~> 1.2)
rack (~> 1.0)
tilt (!= 1.3.0, ~> 1.1)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.4)
therubyracer (0.9.5)
libv8 (~> 3.3.10)
thor (0.14.6)
tilt (1.3.3)
tilt (1.3.7)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
Expand Down