Bundle updated
This commit is contained in:
parent
959f5a72d7
commit
ad0f8aa066
33
Gemfile.lock
33
Gemfile.lock
@ -1,20 +1,21 @@
|
||||
GIT
|
||||
remote: git://github.com/activerecord-hackery/polyamorous.git
|
||||
revision: c1a6a04972709a10296cb0705de2433791b3dbf8
|
||||
revision: 4139b9f0ee8e3ec435d1b722d9f531361cae95af
|
||||
specs:
|
||||
polyamorous (1.0.0)
|
||||
activerecord (>= 3.0)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/activerecord-hackery/ransack.git
|
||||
revision: d51c78f9071f291b0707ed32093e191f4d8d3b26
|
||||
revision: d5cc866745fd4a577fb9c7e676262f8a3f8d41cd
|
||||
branch: rails-4.1
|
||||
specs:
|
||||
ransack (1.1.0)
|
||||
ransack (1.2.2)
|
||||
actionpack (>= 4.0)
|
||||
activerecord (>= 4.0)
|
||||
activesupport (>= 4.0)
|
||||
i18n
|
||||
polyamorous (~> 1.0.0)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/echarp/simple_calendar.git
|
||||
@ -25,14 +26,14 @@ GIT
|
||||
|
||||
GIT
|
||||
remote: git://github.com/gregbell/active_admin.git
|
||||
revision: a05b0dccabc2b9d08b1e957ea1443a79033e8ca8
|
||||
revision: a40f3351a8b93f2228c875c98b275a01a40e72a6
|
||||
specs:
|
||||
activeadmin (1.0.0.pre)
|
||||
arbre (~> 1.0)
|
||||
bourbon
|
||||
coffee-rails
|
||||
devise (~> 3.2)
|
||||
formtastic (~> 2.3.0.rc2)
|
||||
formtastic (~> 2.3.0.rc3)
|
||||
inherited_resources (~> 1.3)
|
||||
jquery-rails
|
||||
jquery-ui-rails
|
||||
@ -43,14 +44,14 @@ GIT
|
||||
|
||||
GIT
|
||||
remote: git://github.com/justinfrench/formtastic.git
|
||||
revision: c79e46560d1516c6c3c0ef85fb29bed8e36068ac
|
||||
revision: 16a528a37d84f6c51ddbf196597e9472abc4e255
|
||||
specs:
|
||||
formtastic (2.3.0.rc3)
|
||||
actionpack (>= 3.2.13)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/svenfuchs/i18n-active_record.git
|
||||
revision: 55507cf59f8f2173d38e07e18df0e90d25b1f0f6
|
||||
revision: 2d9a22b6a4e5d809782cdbfa65b14d9e47aa27fc
|
||||
specs:
|
||||
i18n-active_record (0.0.2)
|
||||
i18n (>= 0.5.0)
|
||||
@ -88,8 +89,8 @@ GEM
|
||||
activesupport (>= 3.0.0)
|
||||
arel (5.0.1.20140414130214)
|
||||
bcrypt (3.1.7)
|
||||
bourbon (3.1.8)
|
||||
sass (>= 3.2.0)
|
||||
bourbon (3.2.1)
|
||||
sass (~> 3.2)
|
||||
thor
|
||||
builder (3.2.2)
|
||||
celluloid (0.15.2)
|
||||
@ -106,7 +107,7 @@ GEM
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.7.0)
|
||||
compass (0.12.5)
|
||||
compass (0.12.6)
|
||||
chunky_png (~> 1.2)
|
||||
fssm (>= 0.2.7)
|
||||
sass (~> 3.2.19)
|
||||
@ -120,14 +121,14 @@ GEM
|
||||
thread_safe (~> 0.1)
|
||||
warden (~> 1.2.3)
|
||||
devise-i18n (0.10.3)
|
||||
em-websocket (0.5.0)
|
||||
em-websocket (0.5.1)
|
||||
eventmachine (>= 0.12.9)
|
||||
http_parser.rb (~> 0.5.3)
|
||||
http_parser.rb (~> 0.6.0)
|
||||
erubis (2.7.0)
|
||||
eventmachine (1.0.3)
|
||||
execjs (2.0.2)
|
||||
ffi (1.9.3)
|
||||
font-awesome-rails (4.0.3.1)
|
||||
font-awesome-rails (4.0.3.2)
|
||||
railties (>= 3.2, < 5.0)
|
||||
formatador (0.2.4)
|
||||
fssm (0.2.10)
|
||||
@ -159,7 +160,7 @@ GEM
|
||||
actionpack (>= 3.2, < 5)
|
||||
activesupport (>= 3.2, < 5)
|
||||
hike (1.2.3)
|
||||
http_parser.rb (0.5.3)
|
||||
http_parser.rb (0.6.0)
|
||||
i18n (0.6.9)
|
||||
inherited_resources (1.4.1)
|
||||
has_scope (~> 0.6.0.rc)
|
||||
@ -179,7 +180,7 @@ GEM
|
||||
kaminari (0.15.1)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
listen (2.7.1)
|
||||
listen (2.7.2)
|
||||
celluloid (>= 0.15.2)
|
||||
celluloid-io (>= 0.15.0)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
@ -226,7 +227,7 @@ GEM
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.3.1)
|
||||
rb-fsevent (0.9.4)
|
||||
rb-inotify (0.9.3)
|
||||
rb-inotify (0.9.4)
|
||||
ffi (>= 0.5.0)
|
||||
rdoc (4.1.1)
|
||||
json (~> 1.4)
|
||||
|
Loading…
Reference in New Issue
Block a user