Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-03-04 03:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix regressions and use timecop to fix time in tests. Thanks Dan and Hans!

Browse source
This commit is contained in:
Reinier Balt 2013-01-06 16:01:53 +01:00
parent 0d169c4a97
commit e59fa387fa
7 changed files with 78 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

68
Gemfile.lock
View file

@ -9,13 +9,13 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
aasm (3.0.14)
actionmailer (3.2.9)
actionpack (= 3.2.9)
aasm (3.0.15)
actionmailer (3.2.10)
actionpack (= 3.2.10)
mail (~> 2.4.4)
actionpack (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
actionpack (3.2.10)
activemodel (= 3.2.10)
activesupport (= 3.2.10)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@ -23,18 +23,18 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.9)
activesupport (= 3.2.9)
activemodel (3.2.10)
activesupport (= 3.2.10)
builder (~> 3.0.0)
activerecord (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
activerecord (3.2.10)
activemodel (= 3.2.10)
activesupport (= 3.2.10)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.9)
activemodel (= 3.2.9)
activesupport (= 3.2.9)
activesupport (3.2.9)
activeresource (3.2.10)
activemodel (= 3.2.10)
activesupport (= 3.2.10)
activesupport (3.2.10)
i18n (~> 0.6)
multi_json (~> 1.0)
acts_as_list (0.1.9)
@ -47,9 +47,9 @@ GEM
bcrypt-ruby (3.0.1)
bluecloth (2.2.0)
builder (3.0.4)
bullet (4.2.0)
bullet (4.3.0)
uniform_notifier
capybara (2.0.1)
capybara (2.0.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
@ -100,8 +100,8 @@ GEM
jquery-rails (2.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.5)
libv8 (3.11.8.4)
json (1.7.6)
libv8 (3.11.8.9)
libwebsocket (0.1.7.1)
addressable
websocket
@ -126,19 +126,19 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.9)
actionmailer (= 3.2.9)
actionpack (= 3.2.9)
activerecord (= 3.2.9)
activeresource (= 3.2.9)
activesupport (= 3.2.9)
rails (3.2.10)
actionmailer (= 3.2.10)
actionpack (= 3.2.10)
activerecord (= 3.2.10)
activeresource (= 3.2.10)
activesupport (= 3.2.10)
bundler (~> 1.0)
railties (= 3.2.9)
railties (= 3.2.10)
rails_autolink (1.0.9)
rails (~> 3.1)
railties (3.2.9)
actionpack (= 3.2.9)
activesupport (= 3.2.9)
railties (3.2.10)
actionpack (= 3.2.10)
activesupport (= 3.2.10)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@ -152,7 +152,7 @@ GEM
rubyzip (0.9.9)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
sass (3.2.4)
sass (3.2.5)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
@ -175,10 +175,12 @@ GEM
swf_fu (2.0.3)
coffee-script
rails (>= 3.1)
therubyracer (0.11.0)
therubyracer (0.11.1)
libv8 (~> 3.11.8.7)
ref
thor (0.16.0)
tilt (1.3.3)
timecop (0.5.7)
tolk (1.3.4)
will_paginate
ya2yaml (~> 0.26)
@ -189,7 +191,7 @@ GEM
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
uniform_notifier (1.1.0)
uniform_notifier (1.1.1)
websocket (1.0.6)
will_paginate (3.0.3)
xpath (1.0.0)
@ -216,7 +218,6 @@ DEPENDENCIES
formatize
htmlentities
jquery-rails
libv8
mongrel (>= 1.2.0.pre2)
mysql2
rack-mini-profiler
@ -229,6 +230,7 @@ DEPENDENCIES
sqlite3
swf_fu
therubyracer
timecop
tolk
uglifier
will_paginate