Bundle update
This commit is contained in:
parent
bcb420030c
commit
4543c8c3b1
2
Gemfile
2
Gemfile
|
|
@ -26,7 +26,7 @@ gem 'jquery-turbolinks'
|
|||
# Use Uglifier as compressor for JavaScript assets
|
||||
gem 'uglifier'
|
||||
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
|
||||
gem 'jbuilder', '~> 2.0'
|
||||
gem 'jbuilder'
|
||||
# bundle exec rake doc:rails generates the API under doc/api.
|
||||
gem 'sdoc', '~> 0.4.0', group: :doc
|
||||
|
||||
|
|
|
|||
80
Gemfile.lock
80
Gemfile.lock
|
|
@ -1,12 +1,12 @@
|
|||
GIT
|
||||
remote: git://github.com/activeadmin/activeadmin.git
|
||||
revision: 1e61b4e2bc7a886be73970ff30a1c756e1b7bee1
|
||||
revision: 77adc9d56b414b373457b55908b548878967a073
|
||||
specs:
|
||||
activeadmin (1.0.0.pre)
|
||||
arbre (~> 1.0, >= 1.0.2)
|
||||
bourbon
|
||||
coffee-rails
|
||||
formtastic (~> 3.0)
|
||||
formtastic (~> 3.0, < 3.1)
|
||||
formtastic_i18n
|
||||
inherited_resources (~> 1.4, != 1.5.0)
|
||||
jquery-rails
|
||||
|
|
@ -34,31 +34,31 @@ GIT
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (4.1.7)
|
||||
actionpack (= 4.1.7)
|
||||
actionview (= 4.1.7)
|
||||
actionmailer (4.1.8)
|
||||
actionpack (= 4.1.8)
|
||||
actionview (= 4.1.8)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
actionpack (4.1.7)
|
||||
actionview (= 4.1.7)
|
||||
activesupport (= 4.1.7)
|
||||
actionpack (4.1.8)
|
||||
actionview (= 4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
rack (~> 1.5.2)
|
||||
rack-test (~> 0.6.2)
|
||||
actionview (4.1.7)
|
||||
activesupport (= 4.1.7)
|
||||
actionview (4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
actionview-encoded_mail_to (1.0.5)
|
||||
rails
|
||||
activeadmin_pagedown (0.0.2)
|
||||
activeadmin (>= 0.5.0)
|
||||
activemodel (4.1.7)
|
||||
activesupport (= 4.1.7)
|
||||
activemodel (4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.1.7)
|
||||
activemodel (= 4.1.7)
|
||||
activesupport (= 4.1.7)
|
||||
activerecord (4.1.8)
|
||||
activemodel (= 4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
arel (~> 5.0.0)
|
||||
activesupport (4.1.7)
|
||||
activesupport (4.1.8)
|
||||
i18n (~> 0.6, >= 0.6.9)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
minitest (~> 5.1)
|
||||
|
|
@ -156,15 +156,15 @@ GEM
|
|||
lumberjack (~> 1.0)
|
||||
pry (>= 0.9.12)
|
||||
thor (>= 0.18.1)
|
||||
guard-brakeman (0.8.2)
|
||||
guard-brakeman (0.8.3)
|
||||
brakeman (>= 2.1.1)
|
||||
guard (>= 1.1.0)
|
||||
guard (>= 2.0.0)
|
||||
guard-bundler (2.0.0)
|
||||
bundler (~> 1.0)
|
||||
guard (~> 2.2)
|
||||
guard-livereload (2.3.1)
|
||||
guard-livereload (2.4.0)
|
||||
em-websocket (~> 0.5)
|
||||
guard (~> 2.0)
|
||||
guard (~> 2.8)
|
||||
multi_json (~> 1.8)
|
||||
guard-minitest (2.3.2)
|
||||
guard (~> 2.0)
|
||||
|
|
@ -185,7 +185,7 @@ GEM
|
|||
highline (1.6.21)
|
||||
hike (1.2.3)
|
||||
hitimes (1.2.2)
|
||||
http (0.6.2)
|
||||
http (0.6.3)
|
||||
http_parser.rb (~> 0.6.0)
|
||||
http_accept_language (2.0.2)
|
||||
http_parser.rb (0.6.0)
|
||||
|
|
@ -195,7 +195,7 @@ GEM
|
|||
has_scope (~> 0.6.0.rc)
|
||||
railties (>= 3.2, < 4.2)
|
||||
responders (~> 1.0)
|
||||
jbuilder (2.2.4)
|
||||
jbuilder (2.2.5)
|
||||
activesupport (>= 3.0.0, < 5)
|
||||
multi_json (~> 1.2)
|
||||
jquery-rails (3.1.2)
|
||||
|
|
@ -214,7 +214,7 @@ GEM
|
|||
railties (>= 3.1)
|
||||
leaflet-rails (0.7.4)
|
||||
libv8 (3.16.14.7)
|
||||
listen (2.7.11)
|
||||
listen (2.8.0)
|
||||
celluloid (>= 0.15.2)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
rb-inotify (>= 0.9)
|
||||
|
|
@ -227,11 +227,11 @@ GEM
|
|||
actionpack (>= 3.0.0)
|
||||
method_source (0.8.2)
|
||||
mime-types (2.4.3)
|
||||
minitest (5.4.2)
|
||||
minitest (5.4.3)
|
||||
modernizr-rails (2.7.1)
|
||||
multi_json (1.10.1)
|
||||
multipart-post (2.0.0)
|
||||
mysql2 (0.3.16)
|
||||
mysql2 (0.3.17)
|
||||
naught (1.0.0)
|
||||
orm_adapter (0.5.0)
|
||||
parser (2.2.0.pre.7)
|
||||
|
|
@ -249,22 +249,22 @@ GEM
|
|||
rack (1.5.2)
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (4.1.7)
|
||||
actionmailer (= 4.1.7)
|
||||
actionpack (= 4.1.7)
|
||||
actionview (= 4.1.7)
|
||||
activemodel (= 4.1.7)
|
||||
activerecord (= 4.1.7)
|
||||
activesupport (= 4.1.7)
|
||||
rails (4.1.8)
|
||||
actionmailer (= 4.1.8)
|
||||
actionpack (= 4.1.8)
|
||||
actionview (= 4.1.8)
|
||||
activemodel (= 4.1.8)
|
||||
activerecord (= 4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.1.7)
|
||||
railties (= 4.1.8)
|
||||
sprockets-rails (~> 2.0)
|
||||
rails-i18n (4.0.3)
|
||||
i18n (~> 0.6)
|
||||
railties (~> 4.0)
|
||||
railties (4.1.7)
|
||||
actionpack (= 4.1.7)
|
||||
activesupport (= 4.1.7)
|
||||
railties (4.1.8)
|
||||
actionpack (= 4.1.8)
|
||||
activesupport (= 4.1.8)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rainbow (2.0.0)
|
||||
|
|
@ -296,7 +296,7 @@ GEM
|
|||
sexp_processor (~> 4.0)
|
||||
ruby_parser (3.5.0)
|
||||
sexp_processor (~> 4.1)
|
||||
sass (3.4.7)
|
||||
sass (3.4.8)
|
||||
sass-rails (5.0.0.beta1)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (~> 3.2)
|
||||
|
|
@ -308,7 +308,7 @@ GEM
|
|||
select2-rails (3.5.9.1)
|
||||
thor (~> 0.14)
|
||||
sexp_processor (4.4.4)
|
||||
simple_calendar (1.1.7)
|
||||
simple_calendar (1.1.8)
|
||||
rails (>= 3.0)
|
||||
simple_oauth (0.3.0)
|
||||
simplecov (0.9.1)
|
||||
|
|
@ -345,7 +345,7 @@ GEM
|
|||
railties (>= 3.1.1)
|
||||
tinymce-rails-langs (4.20140129)
|
||||
tinymce-rails (~> 4.0)
|
||||
turbolinks (2.5.1)
|
||||
turbolinks (2.5.2)
|
||||
coffee-rails
|
||||
twitter (5.13.0)
|
||||
addressable (~> 2.3)
|
||||
|
|
@ -396,7 +396,7 @@ DEPENDENCIES
|
|||
has_scope
|
||||
http_accept_language
|
||||
i18n-active_record!
|
||||
jbuilder (~> 2.0)
|
||||
jbuilder
|
||||
jquery-rails
|
||||
jquery-sparkline-rails!
|
||||
jquery-turbolinks
|
||||
|
|
|
|||
Loading…
Reference in New Issue