Bundle update
This commit is contained in:
parent
a59d293070
commit
4cb8f30e7c
56
Gemfile.lock
56
Gemfile.lock
|
@ -1,6 +1,6 @@
|
||||||
GIT
|
GIT
|
||||||
remote: git://github.com/activeadmin/activeadmin.git
|
remote: git://github.com/activeadmin/activeadmin.git
|
||||||
revision: 169bad98f2746be19b71357bb16a81065640a337
|
revision: 7ff122d580835d70cfc424bc251e70ab0ec51b3d
|
||||||
specs:
|
specs:
|
||||||
activeadmin (1.0.0.pre4)
|
activeadmin (1.0.0.pre4)
|
||||||
arbre (~> 1.0, >= 1.0.2)
|
arbre (~> 1.0, >= 1.0.2)
|
||||||
|
@ -82,10 +82,10 @@ GEM
|
||||||
arel (6.0.4)
|
arel (6.0.4)
|
||||||
ast (2.3.0)
|
ast (2.3.0)
|
||||||
bcrypt (3.1.11)
|
bcrypt (3.1.11)
|
||||||
bourbon (4.2.7)
|
bourbon (4.3.2)
|
||||||
sass (~> 3.4)
|
sass (~> 3.4)
|
||||||
thor (~> 0.19)
|
thor (~> 0.19)
|
||||||
brakeman (3.4.1)
|
brakeman (3.5.0)
|
||||||
buftok (0.2.0)
|
buftok (0.2.0)
|
||||||
builder (3.2.3)
|
builder (3.2.3)
|
||||||
bundler-audit (0.5.0)
|
bundler-audit (0.5.0)
|
||||||
|
@ -120,7 +120,7 @@ GEM
|
||||||
activemodel
|
activemodel
|
||||||
equalizer (0.0.11)
|
equalizer (0.0.11)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
eventmachine (1.2.1)
|
eventmachine (1.2.2)
|
||||||
execjs (2.7.0)
|
execjs (2.7.0)
|
||||||
faraday (0.11.0)
|
faraday (0.11.0)
|
||||||
multipart-post (>= 1.2, < 3)
|
multipart-post (>= 1.2, < 3)
|
||||||
|
@ -131,10 +131,10 @@ GEM
|
||||||
formtastic (3.1.4)
|
formtastic (3.1.4)
|
||||||
actionpack (>= 3.2.13)
|
actionpack (>= 3.2.13)
|
||||||
formtastic_i18n (0.6.0)
|
formtastic_i18n (0.6.0)
|
||||||
geocoder (1.4.1)
|
geocoder (1.4.3)
|
||||||
globalid (0.3.7)
|
globalid (0.3.7)
|
||||||
activesupport (>= 4.1.0)
|
activesupport (>= 4.1.0)
|
||||||
guard (2.14.0)
|
guard (2.14.1)
|
||||||
formatador (>= 0.2.4)
|
formatador (>= 0.2.4)
|
||||||
listen (>= 2.7, < 4.0)
|
listen (>= 2.7, < 4.0)
|
||||||
lumberjack (~> 1.0)
|
lumberjack (~> 1.0)
|
||||||
|
@ -186,12 +186,12 @@ GEM
|
||||||
actionpack (>= 3.2, < 5)
|
actionpack (>= 3.2, < 5)
|
||||||
activesupport (>= 3.2, < 5)
|
activesupport (>= 3.2, < 5)
|
||||||
high_voltage (3.0.0)
|
high_voltage (3.0.0)
|
||||||
html2haml (2.0.0)
|
html2haml (2.1.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
haml (~> 4.0.0)
|
haml (~> 4.0)
|
||||||
nokogiri (~> 1.6.0)
|
nokogiri (>= 1.6.0)
|
||||||
ruby_parser (~> 3.5)
|
ruby_parser (~> 3.5)
|
||||||
http (2.1.0)
|
http (2.2.1)
|
||||||
addressable (~> 2.3)
|
addressable (~> 2.3)
|
||||||
http-cookie (~> 1.0)
|
http-cookie (~> 1.0)
|
||||||
http-form_data (~> 1.0.1)
|
http-form_data (~> 1.0.1)
|
||||||
|
@ -201,12 +201,12 @@ GEM
|
||||||
http-form_data (1.0.1)
|
http-form_data (1.0.1)
|
||||||
http_accept_language (2.1.0)
|
http_accept_language (2.1.0)
|
||||||
http_parser.rb (0.6.0)
|
http_parser.rb (0.6.0)
|
||||||
i18n (0.7.0)
|
i18n (0.8.0)
|
||||||
ice_cube (0.14.0)
|
ice_cube (0.15.0)
|
||||||
inherited_resources (1.6.0)
|
inherited_resources (1.7.0)
|
||||||
actionpack (>= 3.2, < 5)
|
actionpack (>= 3.2, < 5.1)
|
||||||
has_scope (~> 0.6.0.rc)
|
has_scope (~> 0.6)
|
||||||
railties (>= 3.2, < 5)
|
railties (>= 3.2, < 5.1)
|
||||||
responders
|
responders
|
||||||
jbuilder (2.6.1)
|
jbuilder (2.6.1)
|
||||||
activesupport (>= 3.0.0, < 5.1)
|
activesupport (>= 3.0.0, < 5.1)
|
||||||
|
@ -257,7 +257,7 @@ GEM
|
||||||
mysql2 (0.4.5)
|
mysql2 (0.4.5)
|
||||||
naught (1.1.0)
|
naught (1.1.0)
|
||||||
nenv (0.3.0)
|
nenv (0.3.0)
|
||||||
nokogiri (1.6.8.1)
|
nokogiri (1.7.0.1)
|
||||||
mini_portile2 (~> 2.1.0)
|
mini_portile2 (~> 2.1.0)
|
||||||
notiffany (0.1.1)
|
notiffany (0.1.1)
|
||||||
nenv (~> 0.1)
|
nenv (~> 0.1)
|
||||||
|
@ -266,7 +266,7 @@ GEM
|
||||||
paper_trail (6.0.2)
|
paper_trail (6.0.2)
|
||||||
activerecord (>= 4.0, < 5.2)
|
activerecord (>= 4.0, < 5.2)
|
||||||
request_store (~> 1.1)
|
request_store (~> 1.1)
|
||||||
parser (2.3.3.1)
|
parser (2.4.0.0)
|
||||||
ast (~> 2.2)
|
ast (~> 2.2)
|
||||||
piwik_analytics (1.0.2)
|
piwik_analytics (1.0.2)
|
||||||
actionpack
|
actionpack
|
||||||
|
@ -298,9 +298,9 @@ GEM
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.2.7.1)
|
railties (= 4.2.7.1)
|
||||||
sprockets-rails
|
sprockets-rails
|
||||||
rails-assets-leaflet (1.0.2)
|
rails-assets-leaflet (1.0.3)
|
||||||
rails-assets-leaflet.markercluster (1.0.0)
|
rails-assets-leaflet.markercluster (1.0.3)
|
||||||
rails-assets-leaflet (>= 1.0.0)
|
rails-assets-leaflet (>= 1.0.3)
|
||||||
rails-deprecated_sanitizer (1.0.3)
|
rails-deprecated_sanitizer (1.0.3)
|
||||||
activesupport (>= 4.2.0.alpha)
|
activesupport (>= 4.2.0.alpha)
|
||||||
rails-dom-testing (1.0.8)
|
rails-dom-testing (1.0.8)
|
||||||
|
@ -326,7 +326,7 @@ GEM
|
||||||
i18n
|
i18n
|
||||||
polyamorous (~> 1.3)
|
polyamorous (~> 1.3)
|
||||||
rb-fsevent (0.9.8)
|
rb-fsevent (0.9.8)
|
||||||
rb-inotify (0.9.7)
|
rb-inotify (0.9.8)
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
rdoc (4.3.0)
|
rdoc (4.3.0)
|
||||||
redcarpet (3.4.0)
|
redcarpet (3.4.0)
|
||||||
|
@ -354,12 +354,12 @@ GEM
|
||||||
sdoc (0.4.2)
|
sdoc (0.4.2)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
rdoc (~> 4.0)
|
rdoc (~> 4.0)
|
||||||
sexp_processor (4.7.0)
|
sexp_processor (4.8.0)
|
||||||
shellany (0.0.1)
|
shellany (0.0.1)
|
||||||
simple_calendar (2.2.2)
|
simple_calendar (2.2.3)
|
||||||
rails (>= 3.0)
|
rails (>= 3.0)
|
||||||
simple_oauth (0.3.1)
|
simple_oauth (0.3.1)
|
||||||
simplecov (0.12.0)
|
simplecov (0.13.0)
|
||||||
docile (~> 1.1.0)
|
docile (~> 1.1.0)
|
||||||
json (>= 1.8, < 3)
|
json (>= 1.8, < 3)
|
||||||
simplecov-html (~> 0.10.0)
|
simplecov-html (~> 0.10.0)
|
||||||
|
@ -385,8 +385,8 @@ GEM
|
||||||
ref
|
ref
|
||||||
thor (0.19.4)
|
thor (0.19.4)
|
||||||
thread_safe (0.3.5)
|
thread_safe (0.3.5)
|
||||||
tilt (2.0.5)
|
tilt (2.0.6)
|
||||||
tinymce-rails (4.5.2)
|
tinymce-rails (4.5.3)
|
||||||
railties (>= 3.1.1)
|
railties (>= 3.1.1)
|
||||||
tinymce-rails-langs (4.20160310)
|
tinymce-rails-langs (4.20160310)
|
||||||
tinymce-rails (~> 4.1, >= 4.1.10)
|
tinymce-rails (~> 4.1, >= 4.1.10)
|
||||||
|
@ -411,7 +411,7 @@ GEM
|
||||||
unf_ext
|
unf_ext
|
||||||
unf_ext (0.0.7.2)
|
unf_ext (0.0.7.2)
|
||||||
unicode-display_width (1.1.3)
|
unicode-display_width (1.1.3)
|
||||||
warden (1.2.6)
|
warden (1.2.7)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
web-console (3.3.0)
|
web-console (3.3.0)
|
||||||
activemodel (>= 4.2)
|
activemodel (>= 4.2)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user