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
93 changes: 47 additions & 46 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ PATH
remote: .
specs:
active_admin-awesome_nested_set (0.0.4)
rails (~> 3.2.5)
rails (>= 3.2.5, < 5.0)

GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.12)
actionpack (= 3.2.12)
mail (~> 2.4.4)
actionpack (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
actionmailer (3.2.22.5)
actionpack (= 3.2.22.5)
mail (~> 2.5.4)
actionpack (3.2.22.5)
activemodel (= 3.2.22.5)
activesupport (= 3.2.22.5)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
Expand All @@ -40,23 +40,23 @@ GEM
meta_search (>= 0.9.2)
rails (>= 3.0.0)
sass (>= 3.1.0)
activemodel (3.2.12)
activesupport (= 3.2.12)
activemodel (3.2.22.5)
activesupport (= 3.2.22.5)
builder (~> 3.0.0)
activerecord (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
activerecord (3.2.22.5)
activemodel (= 3.2.22.5)
activesupport (= 3.2.22.5)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.12)
activemodel (= 3.2.12)
activesupport (= 3.2.12)
activesupport (3.2.12)
i18n (~> 0.6)
activeresource (3.2.22.5)
activemodel (= 3.2.22.5)
activesupport (= 3.2.22.5)
activesupport (3.2.22.5)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
arbre (1.0.1)
activesupport (>= 3.0.0)
arel (3.0.2)
arel (3.0.3)
awesome_nested_set (2.1.6)
activerecord (>= 3.0.0)
bcrypt-ruby (3.0.1)
Expand All @@ -83,6 +83,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.3)
concurrent-ruby (1.1.10)
daemons (1.1.9)
devise (2.2.3)
bcrypt-ruby (~> 3.0)
Expand Down Expand Up @@ -116,23 +117,23 @@ GEM
guard (>= 1.1)
rspec (~> 2.11)
has_scope (0.5.1)
hike (1.2.1)
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)
journey (1.0.4)
jquery-rails (2.2.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.7)
json (1.8.6)
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
listen (0.7.3)
lumberjack (1.0.2)
mail (2.4.4)
i18n (>= 0.4.0)
mail (2.5.5)
mime-types (~> 1.16)
treetop (~> 1.4.8)
meta_search (1.1.3)
Expand All @@ -142,42 +143,42 @@ GEM
polyamorous (~> 0.5.0)
metaclass (0.0.1)
method_source (0.8.1)
mime-types (1.21)
mime-types (1.25.1)
mocha (0.10.5)
metaclass (~> 0.0.1)
multi_json (1.6.1)
multi_json (1.15.0)
nokogiri (1.5.6)
orm_adapter (0.4.0)
polyamorous (0.5.0)
activerecord (~> 3.0)
polyglot (0.3.3)
polyglot (0.3.5)
pry (0.9.12)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
rack (1.4.5)
rack-cache (1.2)
rack (1.4.7)
rack-cache (1.13.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.12)
actionmailer (= 3.2.12)
actionpack (= 3.2.12)
activerecord (= 3.2.12)
activeresource (= 3.2.12)
activesupport (= 3.2.12)
rails (3.2.22.5)
actionmailer (= 3.2.22.5)
actionpack (= 3.2.22.5)
activerecord (= 3.2.22.5)
activeresource (= 3.2.22.5)
activesupport (= 3.2.22.5)
bundler (~> 1.0)
railties (= 3.2.12)
railties (3.2.12)
actionpack (= 3.2.12)
activesupport (= 3.2.12)
railties (= 3.2.22.5)
railties (3.2.22.5)
actionpack (= 3.2.22.5)
activesupport (= 3.2.22.5)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.3)
rake (13.0.6)
rb-inotify (0.9.0)
ffi (>= 0.5.0)
rdoc (3.12.2)
Expand Down Expand Up @@ -214,7 +215,7 @@ GEM
activesupport (>= 3.0.0)
bourne (~> 1.1.2)
slop (3.4.3)
sprockets (2.2.2)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
Expand All @@ -225,12 +226,12 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.17.0)
tilt (1.3.4)
treetop (1.4.12)
thor (1.2.1)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.35)
tzinfo (0.3.61)
warden (1.2.1)
rack (>= 1.0)
websocket (1.0.7)
Expand Down