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
31 changes: 16 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.3)
concurrent-ruby (1.1.6)
dbf (2.0.5)
fastercsv (~> 1.5.4)
delayed_job (3.0.3)
Expand Down Expand Up @@ -138,8 +139,9 @@ GEM
guard (>= 1.1)
has_scope (0.5.1)
highline (1.6.15)
hike (1.2.2)
i18n (0.6.4)
hike (1.2.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
inherited_resources (1.3.1)
has_scope (~> 0.5.0)
responders (~> 0.6)
Expand All @@ -155,8 +157,8 @@ GEM
jruby-rack (1.1.9)
jruby-rack-worker (0.4-java)
jruby-rack (>= 1.1.1)
json (1.7.7)
json (1.7.7-java)
json (2.3.1)
json (2.3.1-java)
json_pure (1.8.0)
launchy (2.1.0)
addressable (~> 2.2.6)
Expand All @@ -178,7 +180,7 @@ GEM
map_layers (0.0.4)
mime-types (1.19)
modernizr-rails (2.0.6)
multi_json (1.7.7)
multi_json (1.15.0)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
Expand All @@ -202,12 +204,12 @@ GEM
rabl (0.7.8)
activesupport (>= 2.3.14)
multi_json (~> 1.0)
rack (1.4.5)
rack-cache (1.2)
rack (1.4.7)
rack-cache (1.12.0)
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.6)
actionmailer (= 3.2.6)
Expand All @@ -229,7 +231,7 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.4)
rake (13.0.1)
ransack (0.7.0)
actionpack (~> 3.0)
activerecord (~> 3.0)
Expand All @@ -239,8 +241,7 @@ GEM
rb-fsevent (0.9.1)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
rdoc (3.12.2)
json (~> 1.4)
rdoc (3.9.5)
remarkable (4.0.0.alpha4)
rspec (>= 2.0.0.alpha11)
remarkable_activemodel (4.0.0.alpha4)
Expand Down Expand Up @@ -283,7 +284,7 @@ GEM
shoulda-matchers (1.2.0)
activesupport (>= 3.0.0)
spoon (0.0.1)
sprockets (2.1.3)
sprockets (2.1.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
Expand All @@ -297,8 +298,8 @@ GEM
therubyrhino (2.0.1)
therubyrhino_jar (>= 1.7.3)
therubyrhino_jar (1.7.4)
thor (0.18.1)
tilt (1.3.6)
thor (1.0.1)
tilt (1.4.1)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
Expand Down