Bundle update
This commit is contained in:
parent
ecb75c7b3a
commit
3616199b43
81
Gemfile.lock
81
Gemfile.lock
@ -1,6 +1,6 @@
|
|||||||
GIT
|
GIT
|
||||||
remote: git://github.com/gregbell/active_admin.git
|
remote: git://github.com/gregbell/active_admin.git
|
||||||
revision: 4ea4042e0b14aedce3d6ed4ab5f4c3a84a954f18
|
revision: 930d34cd224272687613dcf1db4cf5b1347f1098
|
||||||
specs:
|
specs:
|
||||||
activeadmin (1.0.0.pre)
|
activeadmin (1.0.0.pre)
|
||||||
arbre (~> 1.0, >= 1.0.2)
|
arbre (~> 1.0, >= 1.0.2)
|
||||||
@ -25,31 +25,31 @@ GIT
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.1.5)
|
actionmailer (4.1.6)
|
||||||
actionpack (= 4.1.5)
|
actionpack (= 4.1.6)
|
||||||
actionview (= 4.1.5)
|
actionview (= 4.1.6)
|
||||||
mail (~> 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
actionpack (4.1.5)
|
actionpack (4.1.6)
|
||||||
actionview (= 4.1.5)
|
actionview (= 4.1.6)
|
||||||
activesupport (= 4.1.5)
|
activesupport (= 4.1.6)
|
||||||
rack (~> 1.5.2)
|
rack (~> 1.5.2)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.2)
|
||||||
actionview (4.1.5)
|
actionview (4.1.6)
|
||||||
activesupport (= 4.1.5)
|
activesupport (= 4.1.6)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
actionview-encoded_mail_to (1.0.4)
|
actionview-encoded_mail_to (1.0.4)
|
||||||
rails
|
rails
|
||||||
activeadmin_pagedown (0.0.2)
|
activeadmin_pagedown (0.0.2)
|
||||||
activeadmin (>= 0.5.0)
|
activeadmin (>= 0.5.0)
|
||||||
activemodel (4.1.5)
|
activemodel (4.1.6)
|
||||||
activesupport (= 4.1.5)
|
activesupport (= 4.1.6)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
activerecord (4.1.5)
|
activerecord (4.1.6)
|
||||||
activemodel (= 4.1.5)
|
activemodel (= 4.1.6)
|
||||||
activesupport (= 4.1.5)
|
activesupport (= 4.1.6)
|
||||||
arel (~> 5.0.0)
|
arel (~> 5.0.0)
|
||||||
activesupport (4.1.5)
|
activesupport (4.1.6)
|
||||||
i18n (~> 0.6, >= 0.6.9)
|
i18n (~> 0.6, >= 0.6.9)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
@ -100,7 +100,7 @@ GEM
|
|||||||
railties (>= 3.2.6, < 5)
|
railties (>= 3.2.6, < 5)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
warden (~> 1.2.3)
|
warden (~> 1.2.3)
|
||||||
devise-i18n (0.11.0)
|
devise-i18n (0.11.1)
|
||||||
differ (0.1.2)
|
differ (0.1.2)
|
||||||
docile (1.1.5)
|
docile (1.1.5)
|
||||||
em-websocket (0.5.1)
|
em-websocket (0.5.1)
|
||||||
@ -119,7 +119,7 @@ GEM
|
|||||||
formtastic (2.3.1)
|
formtastic (2.3.1)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
fssm (0.2.10)
|
fssm (0.2.10)
|
||||||
geocoder (1.2.4)
|
geocoder (1.2.5)
|
||||||
guard (2.6.1)
|
guard (2.6.1)
|
||||||
formatador (>= 0.2.4)
|
formatador (>= 0.2.4)
|
||||||
listen (~> 2.7)
|
listen (~> 2.7)
|
||||||
@ -177,19 +177,18 @@ GEM
|
|||||||
actionpack (>= 3.0.0)
|
actionpack (>= 3.0.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
leaflet-rails (0.7.3)
|
leaflet-rails (0.7.3)
|
||||||
libv8 (3.16.14.3)
|
libv8 (3.16.14.7)
|
||||||
listen (2.7.9)
|
listen (2.7.9)
|
||||||
celluloid (>= 0.15.2)
|
celluloid (>= 0.15.2)
|
||||||
rb-fsevent (>= 0.9.3)
|
rb-fsevent (>= 0.9.3)
|
||||||
rb-inotify (>= 0.9)
|
rb-inotify (>= 0.9)
|
||||||
lumberjack (1.0.9)
|
lumberjack (1.0.9)
|
||||||
mail (2.5.4)
|
mail (2.6.1)
|
||||||
mime-types (~> 1.16)
|
mime-types (>= 1.16, < 3)
|
||||||
treetop (~> 1.4.8)
|
|
||||||
meta-tags (2.0.0)
|
meta-tags (2.0.0)
|
||||||
actionpack (>= 3.0.0)
|
actionpack (>= 3.0.0)
|
||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
mime-types (1.25.1)
|
mime-types (2.3)
|
||||||
minitest (5.4.1)
|
minitest (5.4.1)
|
||||||
modernizr-rails (2.7.1)
|
modernizr-rails (2.7.1)
|
||||||
multi_json (1.10.1)
|
multi_json (1.10.1)
|
||||||
@ -200,7 +199,6 @@ GEM
|
|||||||
slop (~> 3.4, >= 3.4.5)
|
slop (~> 3.4, >= 3.4.5)
|
||||||
polyamorous (1.1.0)
|
polyamorous (1.1.0)
|
||||||
activerecord (>= 3.0)
|
activerecord (>= 3.0)
|
||||||
polyglot (0.3.5)
|
|
||||||
powerpack (0.0.9)
|
powerpack (0.0.9)
|
||||||
pry (0.10.1)
|
pry (0.10.1)
|
||||||
coderay (~> 1.1.0)
|
coderay (~> 1.1.0)
|
||||||
@ -211,22 +209,22 @@ GEM
|
|||||||
rack (1.5.2)
|
rack (1.5.2)
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.1.5)
|
rails (4.1.6)
|
||||||
actionmailer (= 4.1.5)
|
actionmailer (= 4.1.6)
|
||||||
actionpack (= 4.1.5)
|
actionpack (= 4.1.6)
|
||||||
actionview (= 4.1.5)
|
actionview (= 4.1.6)
|
||||||
activemodel (= 4.1.5)
|
activemodel (= 4.1.6)
|
||||||
activerecord (= 4.1.5)
|
activerecord (= 4.1.6)
|
||||||
activesupport (= 4.1.5)
|
activesupport (= 4.1.6)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.1.5)
|
railties (= 4.1.6)
|
||||||
sprockets-rails (~> 2.0)
|
sprockets-rails (~> 2.0)
|
||||||
rails-i18n (4.0.3)
|
rails-i18n (4.0.3)
|
||||||
i18n (~> 0.6)
|
i18n (~> 0.6)
|
||||||
railties (~> 4.0)
|
railties (~> 4.0)
|
||||||
railties (4.1.5)
|
railties (4.1.6)
|
||||||
actionpack (= 4.1.5)
|
actionpack (= 4.1.6)
|
||||||
activesupport (= 4.1.5)
|
activesupport (= 4.1.6)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rainbow (2.0.0)
|
rainbow (2.0.0)
|
||||||
@ -240,19 +238,19 @@ GEM
|
|||||||
rb-fsevent (0.9.4)
|
rb-fsevent (0.9.4)
|
||||||
rb-inotify (0.9.5)
|
rb-inotify (0.9.5)
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
rdoc (4.1.1)
|
rdoc (4.1.2)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
redcarpet (3.1.2)
|
redcarpet (3.1.2)
|
||||||
ref (1.0.5)
|
ref (1.0.5)
|
||||||
responders (1.0.0)
|
responders (1.0.0)
|
||||||
railties (>= 3.2, < 5)
|
railties (>= 3.2, < 5)
|
||||||
rubocop (0.26.0)
|
rubocop (0.26.1)
|
||||||
astrolabe (~> 1.3)
|
astrolabe (~> 1.3)
|
||||||
parser (>= 2.2.0.pre.4, < 3.0)
|
parser (>= 2.2.0.pre.4, < 3.0)
|
||||||
powerpack (~> 0.0.6)
|
powerpack (~> 0.0.6)
|
||||||
rainbow (>= 1.99.1, < 3.0)
|
rainbow (>= 1.99.1, < 3.0)
|
||||||
ruby-progressbar (~> 1.4)
|
ruby-progressbar (~> 1.4)
|
||||||
ruby-progressbar (1.5.1)
|
ruby-progressbar (1.6.0)
|
||||||
ruby2ruby (2.1.2)
|
ruby2ruby (2.1.2)
|
||||||
ruby_parser (~> 3.1)
|
ruby_parser (~> 3.1)
|
||||||
sexp_processor (~> 4.0)
|
sexp_processor (~> 4.0)
|
||||||
@ -300,15 +298,12 @@ GEM
|
|||||||
thor (0.19.1)
|
thor (0.19.1)
|
||||||
thread_safe (0.3.4)
|
thread_safe (0.3.4)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
timers (4.0.0)
|
timers (4.0.1)
|
||||||
hitimes
|
hitimes
|
||||||
tinymce-rails (4.1.4)
|
tinymce-rails (4.1.5)
|
||||||
railties (>= 3.1.1)
|
railties (>= 3.1.1)
|
||||||
tinymce-rails-langs (4.20140129)
|
tinymce-rails-langs (4.20140129)
|
||||||
tinymce-rails (~> 4.0)
|
tinymce-rails (~> 4.0)
|
||||||
treetop (1.4.15)
|
|
||||||
polyglot
|
|
||||||
polyglot (>= 0.3.1)
|
|
||||||
turbolinks (2.3.0)
|
turbolinks (2.3.0)
|
||||||
coffee-rails
|
coffee-rails
|
||||||
tzinfo (1.2.2)
|
tzinfo (1.2.2)
|
||||||
|
Loading…
Reference in New Issue
Block a user