bundle update
This commit is contained in:
wvengen
parent
c585f53f54
commit
fe38e168bd
2 changed files with 55 additions and 64 deletions
4
Gemfile
4
Gemfile
|
|
@ -18,7 +18,7 @@ gem 'select2-rails'
|
|||
gem 'bootstrap-datepicker-rails'
|
||||
gem 'date_time_attribute'
|
||||
gem 'rails-assets-listjs', '0.2.0.beta.4' # remember to maintain list.*.js plugins and template engines on update
|
||||
gem 'i18n-js', git: 'git://github.com/fnando/i18n-js.git' # to avoid US-ASCII js.erb error
|
||||
gem 'i18n-js', '~> 3.0.0.rc6'
|
||||
gem 'rails-i18n'
|
||||
|
||||
gem 'mysql2'
|
||||
|
|
@ -45,7 +45,7 @@ gem 'ruby-units'
|
|||
gem 'attribute_normalizer'
|
||||
|
||||
# we use the git version of acts_as_versioned, and need to include it in this Gemfile
|
||||
gem 'acts_as_versioned', git: 'git://github.com/technoweenie/acts_as_versioned.git'
|
||||
gem 'acts_as_versioned', github: 'technoweenie/acts_as_versioned'
|
||||
gem 'foodsoft_wiki', path: 'lib/foodsoft_wiki'
|
||||
gem 'foodsoft_messages', path: 'lib/foodsoft_messages'
|
||||
|
||||
|
|
|
|||
115
Gemfile.lock
115
Gemfile.lock
|
|
@ -11,13 +11,6 @@ GIT
|
|||
specs:
|
||||
localize_input (0.1.0)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/fnando/i18n-js.git
|
||||
revision: 4b79f1d3a92a44108a03bd184669d43109b2eed8
|
||||
specs:
|
||||
i18n-js (3.0.0.rc6)
|
||||
i18n (~> 0.6)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/saveritemedical/client_side_validations-simple_form.git
|
||||
revision: b97c938be745de1134169026425aa0c990b8b072
|
||||
|
|
@ -53,31 +46,31 @@ PATH
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (4.0.9)
|
||||
actionpack (= 4.0.9)
|
||||
mail (~> 2.5.4)
|
||||
actionpack (4.0.9)
|
||||
activesupport (= 4.0.9)
|
||||
actionmailer (4.0.10)
|
||||
actionpack (= 4.0.10)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
actionpack (4.0.10)
|
||||
activesupport (= 4.0.10)
|
||||
builder (~> 3.1.0)
|
||||
erubis (~> 2.7.0)
|
||||
rack (~> 1.5.2)
|
||||
rack-test (~> 0.6.2)
|
||||
activemodel (4.0.9)
|
||||
activesupport (= 4.0.9)
|
||||
activemodel (4.0.10)
|
||||
activesupport (= 4.0.10)
|
||||
builder (~> 3.1.0)
|
||||
activerecord (4.0.9)
|
||||
activemodel (= 4.0.9)
|
||||
activerecord (4.0.10)
|
||||
activemodel (= 4.0.10)
|
||||
activerecord-deprecated_finders (~> 1.0.2)
|
||||
activesupport (= 4.0.9)
|
||||
activesupport (= 4.0.10)
|
||||
arel (~> 4.0.0)
|
||||
activerecord-deprecated_finders (1.0.3)
|
||||
activesupport (4.0.9)
|
||||
activesupport (4.0.10)
|
||||
i18n (~> 0.6, >= 0.6.9)
|
||||
minitest (~> 4.2)
|
||||
multi_json (~> 1.3)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.37)
|
||||
acts_as_tree (2.0.0)
|
||||
acts_as_tree (2.1.0)
|
||||
activerecord (>= 3.0.0)
|
||||
arel (4.0.2)
|
||||
attribute_normalizer (1.2.0)
|
||||
|
|
@ -90,7 +83,7 @@ GEM
|
|||
bootstrap-datepicker-rails (1.3.0.2)
|
||||
railties (>= 3.0)
|
||||
builder (3.1.4)
|
||||
bullet (4.13.1)
|
||||
bullet (4.14.0)
|
||||
activesupport (>= 3.0.0)
|
||||
uniform_notifier (>= 1.6.0)
|
||||
callsite (0.0.11)
|
||||
|
|
@ -104,16 +97,16 @@ GEM
|
|||
capistrano-rails (1.1.2)
|
||||
capistrano (~> 3.1)
|
||||
capistrano-bundler (~> 1.1)
|
||||
capistrano-rvm (0.1.1)
|
||||
capistrano-rvm (0.1.2)
|
||||
capistrano (~> 3.0)
|
||||
sshkit (~> 1.2)
|
||||
capybara (2.4.1)
|
||||
capybara (2.4.4)
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
xpath (~> 2.0)
|
||||
childprocess (0.5.3)
|
||||
childprocess (0.5.5)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
chronic (0.10.2)
|
||||
coderay (1.1.0)
|
||||
|
|
@ -139,19 +132,20 @@ GEM
|
|||
date_time_attribute (0.1.2)
|
||||
activesupport (>= 3.0.0)
|
||||
debug_inspector (0.0.2)
|
||||
deface (1.0.0)
|
||||
deface (1.0.1)
|
||||
colorize (>= 0.5.8)
|
||||
nokogiri (~> 1.6.0)
|
||||
polyglot
|
||||
rails (>= 3.1)
|
||||
diff-lcs (1.2.5)
|
||||
diffy (3.0.6)
|
||||
diffy (3.0.7)
|
||||
docile (1.1.5)
|
||||
erubis (2.7.0)
|
||||
eventmachine (1.0.3)
|
||||
exception_notification (4.0.1)
|
||||
actionmailer (>= 3.0.4)
|
||||
activesupport (>= 3.0.4)
|
||||
execjs (2.2.1)
|
||||
execjs (2.2.2)
|
||||
expression_parser (0.9.0)
|
||||
factory_girl (4.4.0)
|
||||
activesupport (>= 3.0.0)
|
||||
|
|
@ -160,7 +154,7 @@ GEM
|
|||
railties (>= 3.0.0)
|
||||
faker (1.4.3)
|
||||
i18n (~> 0.5)
|
||||
ffi (1.9.3)
|
||||
ffi (1.9.6)
|
||||
haml (4.0.5)
|
||||
tilt
|
||||
haml-rails (0.5.3)
|
||||
|
|
@ -173,6 +167,8 @@ GEM
|
|||
activesupport (>= 3.2, < 5)
|
||||
hike (1.2.3)
|
||||
i18n (0.6.11)
|
||||
i18n-js (3.0.0.rc6)
|
||||
i18n (~> 0.6)
|
||||
i18n-spec (0.5.2)
|
||||
iso
|
||||
inherited_resources (1.5.0)
|
||||
|
|
@ -192,10 +188,9 @@ GEM
|
|||
less-rails (2.5.0)
|
||||
actionpack (>= 3.1)
|
||||
less (~> 2.5.0)
|
||||
libv8 (3.16.14.3)
|
||||
mail (2.5.4)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
libv8 (3.16.14.7)
|
||||
mail (2.6.1)
|
||||
mime-types (>= 1.16, < 3)
|
||||
mailcatcher (0.2.4)
|
||||
eventmachine
|
||||
haml
|
||||
|
|
@ -210,7 +205,7 @@ GEM
|
|||
callsite (~> 0.0, >= 0.0.11)
|
||||
rack-contrib (~> 1.1)
|
||||
railties (>= 3.0.0, < 5.0.0)
|
||||
mime-types (1.25.1)
|
||||
mime-types (2.4.2)
|
||||
mini_portile (0.6.0)
|
||||
minitest (4.7.5)
|
||||
mono_logger (1.1.0)
|
||||
|
|
@ -219,17 +214,17 @@ GEM
|
|||
net-scp (1.2.1)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh (2.9.1)
|
||||
netrc (0.7.7)
|
||||
netrc (0.8.0)
|
||||
nokogiri (1.6.3.1)
|
||||
mini_portile (= 0.6.0)
|
||||
pdf-core (0.2.5)
|
||||
pdf-core (0.4.0)
|
||||
polyamorous (1.1.0)
|
||||
activerecord (>= 3.0)
|
||||
polyglot (0.3.5)
|
||||
prawn (1.2.1)
|
||||
pdf-core (~> 0.2.5)
|
||||
ttfunk (~> 1.2.0)
|
||||
prawn-table (0.1.1)
|
||||
prawn (1.3.0)
|
||||
pdf-core (~> 0.4.0)
|
||||
ttfunk (~> 1.4.0)
|
||||
prawn-table (0.2.0)
|
||||
protected_attributes (1.0.8)
|
||||
activemodel (>= 4.0.1, < 5.0)
|
||||
quiet_assets (1.0.3)
|
||||
|
|
@ -241,28 +236,28 @@ GEM
|
|||
rack
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (4.0.9)
|
||||
actionmailer (= 4.0.9)
|
||||
actionpack (= 4.0.9)
|
||||
activerecord (= 4.0.9)
|
||||
activesupport (= 4.0.9)
|
||||
rails (4.0.10)
|
||||
actionmailer (= 4.0.10)
|
||||
actionpack (= 4.0.10)
|
||||
activerecord (= 4.0.10)
|
||||
activesupport (= 4.0.10)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.0.9)
|
||||
railties (= 4.0.10)
|
||||
sprockets-rails (~> 2.0)
|
||||
rails-assets-listjs (0.2.0.beta.4)
|
||||
railties (>= 3.1)
|
||||
rails-i18n (4.0.2)
|
||||
rails-i18n (4.0.3)
|
||||
i18n (~> 0.6)
|
||||
rails (>= 4.0)
|
||||
railties (~> 4.0)
|
||||
rails-settings-cached (0.4.1)
|
||||
rails (>= 4.0.0)
|
||||
railties (4.0.9)
|
||||
actionpack (= 4.0.9)
|
||||
activesupport (= 4.0.9)
|
||||
railties (4.0.10)
|
||||
actionpack (= 4.0.10)
|
||||
activesupport (= 4.0.10)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.3.2)
|
||||
ransack (1.3.0)
|
||||
ransack (1.4.1)
|
||||
actionpack (>= 3.0)
|
||||
activerecord (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
|
|
@ -329,9 +324,9 @@ GEM
|
|||
simple_form (3.0.2)
|
||||
actionpack (~> 4.0)
|
||||
activemodel (~> 4.0)
|
||||
simplecov (0.9.0)
|
||||
simplecov (0.9.1)
|
||||
docile (~> 1.1.0)
|
||||
multi_json
|
||||
multi_json (~> 1.0)
|
||||
simplecov-html (~> 0.8.0)
|
||||
simplecov-html (0.8.0)
|
||||
sinatra (1.4.5)
|
||||
|
|
@ -346,10 +341,10 @@ GEM
|
|||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sprockets-rails (2.1.3)
|
||||
sprockets-rails (2.2.0)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (~> 2.8)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sqlite3 (1.3.9)
|
||||
sqlite3-ruby (1.3.3)
|
||||
sqlite3 (>= 1.3.3)
|
||||
|
|
@ -369,11 +364,8 @@ GEM
|
|||
thor (0.19.1)
|
||||
thread_safe (0.3.4)
|
||||
tilt (1.4.1)
|
||||
tins (1.3.2)
|
||||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
ttfunk (1.2.2)
|
||||
tins (1.3.3)
|
||||
ttfunk (1.4.0)
|
||||
twitter-bootstrap-rails (2.2.8)
|
||||
actionpack (>= 3.1)
|
||||
execjs
|
||||
|
|
@ -387,8 +379,7 @@ GEM
|
|||
vegas (0.1.11)
|
||||
rack (>= 1.0.0)
|
||||
websocket (1.2.1)
|
||||
whenever (0.9.2)
|
||||
activesupport (>= 2.3.4)
|
||||
whenever (0.9.3)
|
||||
chronic (>= 0.6.3)
|
||||
wikicloth (0.8.1)
|
||||
builder
|
||||
|
|
@ -427,7 +418,7 @@ DEPENDENCIES
|
|||
foodsoft_messages!
|
||||
foodsoft_wiki!
|
||||
haml-rails
|
||||
i18n-js!
|
||||
i18n-js (~> 3.0.0.rc6)
|
||||
i18n-spec
|
||||
inherited_resources
|
||||
jquery-rails
|
||||
|
|
|
|||
Loading…
Reference in a new issue