Skip to content
Open
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ source 'https://rubygems.org/'
#ruby-gemset=gui
ruby ">= 2.1.4"

gem 'activeadmin', '0.5.1'
gem 'activeadmin', '0.6.0'
39 changes: 20 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activeadmin (0.5.1)
activeadmin (0.6.0)
arbre (>= 1.0.1)
bourbon (>= 1.0.0)
devise (>= 1.1.2)
Expand All @@ -40,15 +40,15 @@ GEM
activesupport (3.2.22.5)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
arbre (1.1.1)
arbre (2.0.0)
activesupport (>= 3.0.0)
ruby2_keywords (>= 0.0.2)
arel (3.0.3)
bcrypt (3.1.12)
bourbon (5.0.1)
sass (~> 3.4)
thor (~> 0.19)
bcrypt (3.1.20)
bourbon (7.3.0)
thor (~> 1.0)
builder (3.0.4)
concurrent-ruby (1.0.5)
concurrent-ruby (1.2.3)
devise (3.5.10)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand All @@ -58,7 +58,7 @@ GEM
warden (~> 1.2.3)
erubis (2.7.0)
fastercsv (1.5.5)
ffi (1.9.25)
ffi (1.16.3)
formtastic (3.1.5)
actionpack (>= 3.2.13)
has_scope (0.6.0)
Expand Down Expand Up @@ -89,13 +89,13 @@ GEM
activesupport (~> 3.1)
polyamorous (~> 0.5.0)
mime-types (1.25.1)
multi_json (1.13.1)
multi_json (1.15.0)
orm_adapter (0.5.0)
polyamorous (0.5.0)
activerecord (~> 3.0)
polyglot (0.3.5)
rack (1.4.7)
rack-cache (1.8.0)
rack-cache (1.16.0)
rack (>= 0.4)
rack-ssl (1.3.4)
rack
Expand All @@ -116,15 +116,16 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (3.12.2)
json (~> 1.4)
responders (1.1.2)
railties (>= 3.2, < 4.2)
sass (3.5.6)
ruby2_keywords (0.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand All @@ -134,24 +135,24 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
thor (0.20.0)
thor (1.3.1)
thread_safe (0.3.6)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.54)
tzinfo (0.3.62)
warden (1.2.7)
rack (>= 1.0)

PLATFORMS
ruby

DEPENDENCIES
activeadmin (= 0.5.1)
activeadmin (= 0.6.0)

RUBY VERSION
ruby 2.1.4p265

BUNDLED WITH
1.16.2
1.17.3