Bundle update
This commit is contained in:
parent
85d4f16621
commit
3fc4dce87c
25
Gemfile.lock
25
Gemfile.lock
@ -1,13 +1,13 @@
|
|||||||
GIT
|
GIT
|
||||||
remote: git://github.com/activerecord-hackery/polyamorous.git
|
remote: git://github.com/activerecord-hackery/polyamorous.git
|
||||||
revision: 49b2607c14583fb35189f74dce05e0dd3bcf0bd8
|
revision: 69ce1f436ee93dcb011631bb727a6e3ab38a27f4
|
||||||
specs:
|
specs:
|
||||||
polyamorous (1.0.0)
|
polyamorous (1.0.0)
|
||||||
activerecord (>= 3.0)
|
activerecord (>= 3.0)
|
||||||
|
|
||||||
GIT
|
GIT
|
||||||
remote: git://github.com/activerecord-hackery/ransack.git
|
remote: git://github.com/activerecord-hackery/ransack.git
|
||||||
revision: a4b7be58eb6d6dcff5082d7c945f3d08fe4ec263
|
revision: 79fe700bca7d69f30a44898635fdddd3a8ef486d
|
||||||
branch: rails-4.1
|
branch: rails-4.1
|
||||||
specs:
|
specs:
|
||||||
ransack (1.2.4)
|
ransack (1.2.4)
|
||||||
@ -26,7 +26,7 @@ GIT
|
|||||||
|
|
||||||
GIT
|
GIT
|
||||||
remote: git://github.com/gregbell/active_admin.git
|
remote: git://github.com/gregbell/active_admin.git
|
||||||
revision: ad33a0f6c772e74a23232baa7db0b3db2fe19db2
|
revision: 27c570994c1c58b070a3a2b97d9f67fb41b78ce9
|
||||||
specs:
|
specs:
|
||||||
activeadmin (1.0.0.pre)
|
activeadmin (1.0.0.pre)
|
||||||
arbre (~> 1.0)
|
arbre (~> 1.0)
|
||||||
@ -93,9 +93,6 @@ GEM
|
|||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
celluloid (0.15.2)
|
celluloid (0.15.2)
|
||||||
timers (~> 1.1.0)
|
timers (~> 1.1.0)
|
||||||
celluloid-io (0.15.0)
|
|
||||||
celluloid (>= 0.15.0)
|
|
||||||
nio4r (>= 0.5.0)
|
|
||||||
chunky_png (1.3.1)
|
chunky_png (1.3.1)
|
||||||
coderay (1.1.0)
|
coderay (1.1.0)
|
||||||
coffee-rails (4.0.1)
|
coffee-rails (4.0.1)
|
||||||
@ -120,7 +117,7 @@ GEM
|
|||||||
eventmachine (1.0.3)
|
eventmachine (1.0.3)
|
||||||
execjs (2.0.2)
|
execjs (2.0.2)
|
||||||
ffi (1.9.3)
|
ffi (1.9.3)
|
||||||
font-awesome-rails (4.0.3.2)
|
font-awesome-rails (4.1.0.0)
|
||||||
railties (>= 3.2, < 5.0)
|
railties (>= 3.2, < 5.0)
|
||||||
formatador (0.2.4)
|
formatador (0.2.4)
|
||||||
fssm (0.2.10)
|
fssm (0.2.10)
|
||||||
@ -172,9 +169,8 @@ GEM
|
|||||||
kaminari (0.15.1)
|
kaminari (0.15.1)
|
||||||
actionpack (>= 3.0.0)
|
actionpack (>= 3.0.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
listen (2.7.4)
|
listen (2.7.5)
|
||||||
celluloid (>= 0.15.2)
|
celluloid (>= 0.15.2)
|
||||||
celluloid-io (>= 0.15.0)
|
|
||||||
rb-fsevent (>= 0.9.3)
|
rb-fsevent (>= 0.9.3)
|
||||||
rb-inotify (>= 0.9)
|
rb-inotify (>= 0.9)
|
||||||
lumberjack (1.0.5)
|
lumberjack (1.0.5)
|
||||||
@ -183,11 +179,10 @@ GEM
|
|||||||
treetop (~> 1.4.8)
|
treetop (~> 1.4.8)
|
||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
mime-types (1.25.1)
|
mime-types (1.25.1)
|
||||||
minitest (5.3.3)
|
minitest (5.3.4)
|
||||||
modernizr-rails (2.7.1)
|
modernizr-rails (2.7.1)
|
||||||
multi_json (1.10.0)
|
multi_json (1.10.0)
|
||||||
mysql2 (0.3.15)
|
mysql2 (0.3.16)
|
||||||
nio4r (1.0.0)
|
|
||||||
openlayers-rails (0.0.4)
|
openlayers-rails (0.0.4)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
polyglot (0.3.4)
|
polyglot (0.3.4)
|
||||||
@ -218,13 +213,13 @@ GEM
|
|||||||
activesupport (= 4.1.1)
|
activesupport (= 4.1.1)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rake (10.3.1)
|
rake (10.3.2)
|
||||||
rb-fsevent (0.9.4)
|
rb-fsevent (0.9.4)
|
||||||
rb-inotify (0.9.4)
|
rb-inotify (0.9.4)
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
rdoc (4.1.1)
|
rdoc (4.1.1)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
redcarpet (3.1.1)
|
redcarpet (3.1.2)
|
||||||
responders (1.0.0)
|
responders (1.0.0)
|
||||||
railties (>= 3.2, < 5)
|
railties (>= 3.2, < 5)
|
||||||
sass (3.2.19)
|
sass (3.2.19)
|
||||||
@ -237,7 +232,7 @@ GEM
|
|||||||
json (~> 1.8)
|
json (~> 1.8)
|
||||||
rdoc (~> 4.0, < 5.0)
|
rdoc (~> 4.0, < 5.0)
|
||||||
slop (3.5.0)
|
slop (3.5.0)
|
||||||
spring (1.1.2)
|
spring (1.1.3)
|
||||||
sprockets (2.11.0)
|
sprockets (2.11.0)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
|
Loading…
Reference in New Issue
Block a user