Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity

bundle update

This commit is contained in:
wvengen 2014-12-10 20:07:26 +01:00
parent cee2ac8f9f
commit 7ac3f54709
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -17,7 +17,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', '~> 3.0.0.rc6'
gem 'i18n-js', '~> 3.0.0.rc8'
gem 'rails-i18n'
gem 'mysql2'

38
Gemfile.lock
View File

@ -149,19 +149,26 @@ GEM
faker (1.4.3)
i18n (~> 0.5)
ffi (1.9.6)
haml (4.0.5)
haml (4.1.0.beta.1)
tilt
haml-rails (0.5.3)
haml-rails (0.6.0)
actionpack (>= 4.0.1)
activesupport (>= 4.0.1)
haml (>= 3.1, < 5.0)
html2haml (>= 1.0.1)
railties (>= 4.0.1)
has_scope (0.6.0.rc)
actionpack (>= 3.2, < 5)
activesupport (>= 3.2, < 5)
hike (1.2.3)
hpricot (0.8.6)
html2haml (1.0.1)
erubis (~> 2.7.0)
haml (>= 4.0.0.rc.1)
hpricot (~> 0.8.6)
ruby_parser (~> 3.1.1)
i18n (0.6.11)
i18n-js (3.0.0.rc7)
i18n-js (3.0.0.rc8)
i18n (~> 0.6)
i18n-spec (0.6.0)
iso
@ -212,8 +219,8 @@ GEM
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.1)
netrc (0.8.0)
nokogiri (1.6.4.1)
netrc (0.9.0)
nokogiri (1.6.5)
mini_portile (~> 0.6.0)
pdf-core (0.4.0)
polyamorous (1.1.0)
@ -266,14 +273,14 @@ GEM
activesupport (= 4.1.8)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.3.2)
rake (10.4.2)
ransack (1.5.1)
actionpack (>= 3.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
i18n
polyamorous (~> 1.1)
recurring_select (1.2.1)
recurring_select (1.2.4)
coffee-rails (>= 3.1)
ice_cube (>= 0.11)
jquery-rails (>= 3.0)
@ -318,12 +325,14 @@ GEM
rspec (>= 2.11.0, < 3)
ruby-prof (0.15.2)
ruby-units (1.4.5)
ruby_parser (3.1.3)
sexp_processor (~> 4.1)
rubyzip (1.1.6)
sass (3.2.19)
sass-rails (4.0.4)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.2)
sprockets (~> 2.8, < 2.12)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
select2-rails (3.5.9.1)
thor (~> 0.14)
@ -332,12 +341,13 @@ GEM
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0)
sexp_processor (4.4.4)
simple-navigation (3.13.0)
activesupport (>= 2.3.2)
simple-navigation-bootstrap (1.0.0)
railties (>= 3.1)
simple-navigation (>= 3.7.0)
simple_form (3.0.2)
simple_form (3.1.0)
actionpack (~> 4.0)
activemodel (~> 4.0)
simplecov (0.9.1)
@ -353,12 +363,12 @@ GEM
eventmachine (~> 1.0.0)
thin (~> 1.5.0)
slop (3.6.0)
sprockets (2.11.3)
sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.0)
sprockets-rails (2.2.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
@ -390,7 +400,7 @@ GEM
railties (>= 3.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.5.3)
uglifier (2.6.0)
execjs (>= 0.3.0)
json (>= 1.8.0)
uniform_notifier (1.6.2)
@ -434,7 +444,7 @@ DEPENDENCIES
foodsoft_messages!
foodsoft_wiki!
haml-rails
i18n-js (~> 3.0.0.rc6)
i18n-js (~> 3.0.0.rc8)
i18n-spec
ice_cube!
inherited_resources