mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-21 09:40:13 +01:00
fix #1323 so Tracks works with rails 3.2.8. Update all dependencies
This commit is contained in:
parent
3ad632ff86
commit
69ead6d254
2 changed files with 43 additions and 43 deletions
84
Gemfile.lock
84
Gemfile.lock
|
|
@ -3,35 +3,35 @@ GEM
|
||||||
specs:
|
specs:
|
||||||
RedCloth (4.2.9)
|
RedCloth (4.2.9)
|
||||||
aasm (3.0.8)
|
aasm (3.0.8)
|
||||||
actionmailer (3.2.6)
|
actionmailer (3.2.8)
|
||||||
actionpack (= 3.2.6)
|
actionpack (= 3.2.8)
|
||||||
mail (~> 2.4.4)
|
mail (~> 2.4.4)
|
||||||
actionpack (3.2.6)
|
actionpack (3.2.8)
|
||||||
activemodel (= 3.2.6)
|
activemodel (= 3.2.8)
|
||||||
activesupport (= 3.2.6)
|
activesupport (= 3.2.8)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
journey (~> 1.0.1)
|
journey (~> 1.0.4)
|
||||||
rack (~> 1.4.0)
|
rack (~> 1.4.0)
|
||||||
rack-cache (~> 1.2)
|
rack-cache (~> 1.2)
|
||||||
rack-test (~> 0.6.1)
|
rack-test (~> 0.6.1)
|
||||||
sprockets (~> 2.1.3)
|
sprockets (~> 2.1.3)
|
||||||
activemodel (3.2.6)
|
activemodel (3.2.8)
|
||||||
activesupport (= 3.2.6)
|
activesupport (= 3.2.8)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
activerecord (3.2.6)
|
activerecord (3.2.8)
|
||||||
activemodel (= 3.2.6)
|
activemodel (= 3.2.8)
|
||||||
activesupport (= 3.2.6)
|
activesupport (= 3.2.8)
|
||||||
arel (~> 3.0.2)
|
arel (~> 3.0.2)
|
||||||
tzinfo (~> 0.3.29)
|
tzinfo (~> 0.3.29)
|
||||||
activeresource (3.2.6)
|
activeresource (3.2.8)
|
||||||
activemodel (= 3.2.6)
|
activemodel (= 3.2.8)
|
||||||
activesupport (= 3.2.6)
|
activesupport (= 3.2.8)
|
||||||
activesupport (3.2.6)
|
activesupport (3.2.8)
|
||||||
i18n (~> 0.6)
|
i18n (~> 0.6)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
acts_as_list (0.1.6)
|
acts_as_list (0.1.8)
|
||||||
addressable (2.2.8)
|
addressable (2.3.2)
|
||||||
arel (3.0.2)
|
arel (3.0.2)
|
||||||
aruba (0.4.11)
|
aruba (0.4.11)
|
||||||
childprocess (>= 0.2.3)
|
childprocess (>= 0.2.3)
|
||||||
|
|
@ -48,8 +48,8 @@ GEM
|
||||||
rack-test (>= 0.5.4)
|
rack-test (>= 0.5.4)
|
||||||
selenium-webdriver (~> 2.0)
|
selenium-webdriver (~> 2.0)
|
||||||
xpath (~> 0.1.4)
|
xpath (~> 0.1.4)
|
||||||
childprocess (0.3.3)
|
childprocess (0.3.5)
|
||||||
ffi (~> 1.0.6)
|
ffi (~> 1.0, >= 1.0.6)
|
||||||
coffee-rails (3.2.2)
|
coffee-rails (3.2.2)
|
||||||
coffee-script (>= 2.2.0)
|
coffee-script (>= 2.2.0)
|
||||||
railties (~> 3.2.0)
|
railties (~> 3.2.0)
|
||||||
|
|
@ -72,12 +72,12 @@ GEM
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
execjs (1.4.0)
|
execjs (1.4.0)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
factory_girl (3.5.0)
|
factory_girl (4.0.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
factory_girl_rails (3.5.0)
|
factory_girl_rails (4.0.0)
|
||||||
factory_girl (~> 3.5.0)
|
factory_girl (~> 4.0.0)
|
||||||
railties (>= 3.0.0)
|
railties (>= 3.0.0)
|
||||||
ffi (1.0.11)
|
ffi (1.1.5)
|
||||||
formatize (1.1.0)
|
formatize (1.1.0)
|
||||||
RedCloth (~> 4.2)
|
RedCloth (~> 4.2)
|
||||||
actionpack (~> 3.0)
|
actionpack (~> 3.0)
|
||||||
|
|
@ -92,9 +92,9 @@ GEM
|
||||||
jquery-rails (2.0.2)
|
jquery-rails (2.0.2)
|
||||||
railties (>= 3.2.0, < 5.0)
|
railties (>= 3.2.0, < 5.0)
|
||||||
thor (~> 0.14)
|
thor (~> 0.14)
|
||||||
json (1.7.3)
|
json (1.7.4)
|
||||||
libv8 (3.3.10.4)
|
libv8 (3.3.10.4)
|
||||||
libwebsocket (0.1.4)
|
libwebsocket (0.1.5)
|
||||||
addressable
|
addressable
|
||||||
mail (2.4.4)
|
mail (2.4.4)
|
||||||
i18n (>= 0.4.0)
|
i18n (>= 0.4.0)
|
||||||
|
|
@ -115,19 +115,19 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.1)
|
rack-test (0.6.1)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (3.2.6)
|
rails (3.2.8)
|
||||||
actionmailer (= 3.2.6)
|
actionmailer (= 3.2.8)
|
||||||
actionpack (= 3.2.6)
|
actionpack (= 3.2.8)
|
||||||
activerecord (= 3.2.6)
|
activerecord (= 3.2.8)
|
||||||
activeresource (= 3.2.6)
|
activeresource (= 3.2.8)
|
||||||
activesupport (= 3.2.6)
|
activesupport (= 3.2.8)
|
||||||
bundler (~> 1.0)
|
bundler (~> 1.0)
|
||||||
railties (= 3.2.6)
|
railties (= 3.2.8)
|
||||||
rails_autolink (1.0.9)
|
rails_autolink (1.0.9)
|
||||||
rails (~> 3.1)
|
rails (~> 3.1)
|
||||||
railties (3.2.6)
|
railties (3.2.8)
|
||||||
actionpack (= 3.2.6)
|
actionpack (= 3.2.8)
|
||||||
activesupport (= 3.2.6)
|
activesupport (= 3.2.8)
|
||||||
rack-ssl (~> 1.3.2)
|
rack-ssl (~> 1.3.2)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
rdoc (~> 3.4)
|
rdoc (~> 3.4)
|
||||||
|
|
@ -139,8 +139,8 @@ GEM
|
||||||
rspec-core (~> 2.11.0)
|
rspec-core (~> 2.11.0)
|
||||||
rspec-expectations (~> 2.11.0)
|
rspec-expectations (~> 2.11.0)
|
||||||
rspec-mocks (~> 2.11.0)
|
rspec-mocks (~> 2.11.0)
|
||||||
rspec-core (2.11.0)
|
rspec-core (2.11.1)
|
||||||
rspec-expectations (2.11.1)
|
rspec-expectations (2.11.2)
|
||||||
diff-lcs (~> 1.1.3)
|
diff-lcs (~> 1.1.3)
|
||||||
rspec-mocks (2.11.1)
|
rspec-mocks (2.11.1)
|
||||||
rubyzip (0.9.9)
|
rubyzip (0.9.9)
|
||||||
|
|
@ -151,7 +151,7 @@ GEM
|
||||||
railties (~> 3.2.0)
|
railties (~> 3.2.0)
|
||||||
sass (>= 3.1.10)
|
sass (>= 3.1.10)
|
||||||
tilt (~> 1.3)
|
tilt (~> 1.3)
|
||||||
selenium-webdriver (2.24.0)
|
selenium-webdriver (2.25.0)
|
||||||
childprocess (>= 0.2.5)
|
childprocess (>= 0.2.5)
|
||||||
libwebsocket (~> 0.1.3)
|
libwebsocket (~> 0.1.3)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
|
|
@ -161,21 +161,21 @@ GEM
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
tilt (~> 1.1, != 1.3.0)
|
tilt (~> 1.1, != 1.3.0)
|
||||||
sqlite3 (1.3.6)
|
sqlite3 (1.3.6)
|
||||||
swf_fu (2.0.2)
|
swf_fu (2.0.3)
|
||||||
coffee-script
|
coffee-script
|
||||||
rails (>= 3.1)
|
rails (>= 3.1)
|
||||||
therubyracer (0.10.1)
|
therubyracer (0.10.2)
|
||||||
libv8 (~> 3.3.10)
|
libv8 (~> 3.3.10)
|
||||||
thor (0.15.4)
|
thor (0.15.4)
|
||||||
tilt (1.3.3)
|
tilt (1.3.3)
|
||||||
tolk (1.3.1)
|
tolk (1.3.2)
|
||||||
will_paginate
|
will_paginate
|
||||||
ya2yaml (~> 0.26)
|
ya2yaml (~> 0.26)
|
||||||
treetop (1.4.10)
|
treetop (1.4.10)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
tzinfo (0.3.33)
|
tzinfo (0.3.33)
|
||||||
uglifier (1.2.6)
|
uglifier (1.2.7)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
will_paginate (3.0.3)
|
will_paginate (3.0.3)
|
||||||
|
|
|
||||||
|
|
@ -205,7 +205,7 @@ module ApplicationHelper
|
||||||
}.each do |s|
|
}.each do |s|
|
||||||
js << "i18n['#{s}'] = '#{ t(s).gsub(/'/, "\\\\'") }';\n"
|
js << "i18n['#{s}'] = '#{ t(s).gsub(/'/, "\\\\'") }';\n"
|
||||||
end
|
end
|
||||||
return js
|
return js.html_safe
|
||||||
end
|
end
|
||||||
|
|
||||||
def javascript_tag_for_i18n_datepicker
|
def javascript_tag_for_i18n_datepicker
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue