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
38 changes: 23 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ GEM
json (~> 1.4)
nokogiri (>= 1.4.4)
uuidtools (~> 2.1)
bcrypt (3.1.18)
bcrypt-ruby (3.0.1)
builder (3.0.4)
cancan (1.6.10)
Expand All @@ -47,20 +48,24 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.6.3)
concurrent-ruby (1.1.9)
daemon_controller (1.1.5)
devise (2.2.7)
bcrypt-ruby (~> 3.0)
devise (3.5.10)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
warden (~> 1.2.1)
railties (>= 3.2.6, < 5)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
dotenv (0.10.0)
dotenv-rails (0.10.0)
dotenv (= 0.10.0)
erubis (2.7.0)
execjs (2.0.2)
gravtastic (3.2.6)
hike (1.2.3)
i18n (0.6.5)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
journey (1.0.4)
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
Expand All @@ -73,10 +78,10 @@ GEM
treetop (~> 1.4.8)
mime-types (1.25)
mini_portile (0.5.2)
multi_json (1.8.2)
multi_json (1.15.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
orm_adapter (0.4.0)
orm_adapter (0.5.0)
paperclip (3.5.4)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
Expand All @@ -88,12 +93,12 @@ GEM
rake (>= 0.8.1)
pg (0.17.0)
polyglot (0.3.3)
rack (1.4.5)
rack-cache (1.2)
rack (1.4.7)
rack-cache (1.7.1)
rack (>= 0.4)
rack-ssl (1.3.3)
rack-ssl (1.3.4)
rack
rack-test (0.6.2)
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.8)
actionmailer (= 3.2.8)
Expand All @@ -112,10 +117,12 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.1.0)
rake (12.2.1)
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.5)
responders (1.1.2)
railties (>= 3.2, < 4.2)
rest-client (1.6.7)
mime-types (>= 1.16)
sass (3.2.11)
Expand All @@ -126,7 +133,7 @@ GEM
sequel (3.20.0)
sinatra (1.0)
rack (>= 1.0)
sprockets (2.1.3)
sprockets (2.1.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
Expand All @@ -139,7 +146,8 @@ GEM
therubyracer (0.12.0)
libv8 (~> 3.16.14.0)
ref
thor (0.18.1)
thor (0.20.3)
thread_safe (0.3.6)
tilt (1.4.1)
treetop (1.4.15)
polyglot
Expand All @@ -149,7 +157,7 @@ GEM
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
uuidtools (2.1.4)
warden (1.2.3)
warden (1.2.7)
rack (>= 1.0)

PLATFORMS
Expand Down