bundle update
This commit is contained in:
parent
cfc1b427ff
commit
db2f76c4cb
18
Gemfile.lock
18
Gemfile.lock
@ -1,6 +1,6 @@
|
||||
GIT
|
||||
remote: git://github.com/gregbell/active_admin.git
|
||||
revision: 3a8934afb08a586099374975f210f95b43ac9e50
|
||||
revision: 5b4353edc262bcb9df84f5d6f3e35392194d783a
|
||||
specs:
|
||||
activeadmin (1.0.0.pre)
|
||||
arbre (~> 1.0)
|
||||
@ -11,7 +11,7 @@ GIT
|
||||
inherited_resources (~> 1.3)
|
||||
jquery-rails
|
||||
jquery-ui-rails
|
||||
kaminari (~> 0.13)
|
||||
kaminari (~> 0.14)
|
||||
rails (>= 3.2, < 4.1)
|
||||
ransack (~> 1.0)
|
||||
sass-rails
|
||||
@ -69,7 +69,7 @@ GEM
|
||||
sass (~> 3.1)
|
||||
compass-rails (2.0.alpha.0)
|
||||
compass (>= 0.12.2, < 0.14)
|
||||
devise (3.2.1)
|
||||
devise (3.2.2)
|
||||
bcrypt-ruby (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 3.2.6, < 5)
|
||||
@ -98,7 +98,7 @@ GEM
|
||||
guard-bundler (2.0.0)
|
||||
bundler (~> 1.0)
|
||||
guard (~> 2.2)
|
||||
guard-livereload (2.0.0)
|
||||
guard-livereload (2.0.1)
|
||||
em-websocket (~> 0.5)
|
||||
guard (~> 2.0)
|
||||
multi_json (~> 1.8)
|
||||
@ -107,11 +107,11 @@ GEM
|
||||
minitest (>= 3.0)
|
||||
haml (4.0.4)
|
||||
tilt
|
||||
haml-rails (0.4)
|
||||
actionpack (>= 3.1, < 4.1)
|
||||
activesupport (>= 3.1, < 4.1)
|
||||
haml (>= 3.1, < 4.1)
|
||||
railties (>= 3.1, < 4.1)
|
||||
haml-rails (0.5.1)
|
||||
actionpack (~> 4.0.0)
|
||||
activesupport (~> 4.0.0)
|
||||
haml (>= 3.1, < 5.0)
|
||||
railties (~> 4.0.0)
|
||||
has_scope (0.6.0.rc)
|
||||
actionpack (>= 3.2, < 5)
|
||||
activesupport (>= 3.2, < 5)
|
||||
|
Loading…
Reference in New Issue
Block a user