Skip to content

Commit 568f599

Browse files
authored
Merge pull request #274 from mattbrictson/fix-datetime-tests
Upgrade to Rails 4.0.13 to fix datetime helpers
2 parents b57d453 + 09bc100 commit 568f599

File tree

1 file changed

+49
-54
lines changed

1 file changed

+49
-54
lines changed

Gemfile.lock

Lines changed: 49 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -6,85 +6,77 @@ PATH
66
GEM
77
remote: http://rubygems.org/
88
specs:
9-
actionmailer (4.0.0)
10-
actionpack (= 4.0.0)
11-
mail (~> 2.5.3)
12-
actionpack (4.0.0)
13-
activesupport (= 4.0.0)
9+
actionmailer (4.0.13)
10+
actionpack (= 4.0.13)
11+
mail (~> 2.5, >= 2.5.4)
12+
actionpack (4.0.13)
13+
activesupport (= 4.0.13)
1414
builder (~> 3.1.0)
1515
erubis (~> 2.7.0)
1616
rack (~> 1.5.2)
1717
rack-test (~> 0.6.2)
18-
activemodel (4.0.0)
19-
activesupport (= 4.0.0)
18+
activemodel (4.0.13)
19+
activesupport (= 4.0.13)
2020
builder (~> 3.1.0)
21-
activerecord (4.0.0)
22-
activemodel (= 4.0.0)
21+
activerecord (4.0.13)
22+
activemodel (= 4.0.13)
2323
activerecord-deprecated_finders (~> 1.0.2)
24-
activesupport (= 4.0.0)
24+
activesupport (= 4.0.13)
2525
arel (~> 4.0.0)
26-
activerecord-deprecated_finders (1.0.3)
27-
activesupport (4.0.0)
28-
i18n (~> 0.6, >= 0.6.4)
26+
activerecord-deprecated_finders (1.0.4)
27+
activesupport (4.0.13)
28+
i18n (~> 0.6, >= 0.6.9)
2929
minitest (~> 4.2)
3030
multi_json (~> 1.3)
3131
thread_safe (~> 0.1)
3232
tzinfo (~> 0.3.37)
33-
arel (4.0.0)
34-
atomic (1.1.10)
33+
arel (4.0.2)
3534
builder (3.1.4)
35+
concurrent-ruby (1.0.2)
3636
erubis (2.7.0)
37-
hike (1.2.3)
38-
i18n (0.6.4)
39-
jquery-rails (3.0.1)
37+
i18n (0.7.0)
38+
jquery-rails (3.1.4)
4039
railties (>= 3.0, < 5.0)
4140
thor (>= 0.14, < 2.0)
42-
mail (2.5.4)
43-
mime-types (~> 1.16)
44-
treetop (~> 1.4.8)
41+
mail (2.6.4)
42+
mime-types (>= 1.16, < 4)
4543
metaclass (0.0.4)
46-
mime-types (1.23)
44+
mime-types (3.1)
45+
mime-types-data (~> 3.2015)
46+
mime-types-data (3.2016.0521)
4747
minitest (4.7.5)
4848
mocha (1.1.0)
4949
metaclass (~> 0.0.1)
50-
multi_json (1.7.7)
51-
polyglot (0.3.3)
52-
rack (1.5.2)
53-
rack-test (0.6.2)
50+
multi_json (1.12.1)
51+
rack (1.5.5)
52+
rack-test (0.6.3)
5453
rack (>= 1.0)
55-
rails (4.0.0)
56-
actionmailer (= 4.0.0)
57-
actionpack (= 4.0.0)
58-
activerecord (= 4.0.0)
59-
activesupport (= 4.0.0)
54+
rails (4.0.13)
55+
actionmailer (= 4.0.13)
56+
actionpack (= 4.0.13)
57+
activerecord (= 4.0.13)
58+
activesupport (= 4.0.13)
6059
bundler (>= 1.3.0, < 2.0)
61-
railties (= 4.0.0)
62-
sprockets-rails (~> 2.0.0)
63-
railties (4.0.0)
64-
actionpack (= 4.0.0)
65-
activesupport (= 4.0.0)
60+
railties (= 4.0.13)
61+
sprockets-rails (~> 2.0)
62+
railties (4.0.13)
63+
actionpack (= 4.0.13)
64+
activesupport (= 4.0.13)
6665
rake (>= 0.8.7)
6766
thor (>= 0.18.1, < 2.0)
68-
rake (10.1.0)
69-
sprockets (2.10.0)
70-
hike (~> 1.2)
71-
multi_json (~> 1.0)
72-
rack (~> 1.0)
73-
tilt (~> 1.1, != 1.3.0)
74-
sprockets-rails (2.0.0)
67+
rake (11.2.2)
68+
sprockets (3.6.3)
69+
concurrent-ruby (~> 1.0)
70+
rack (> 1, < 3)
71+
sprockets-rails (2.3.3)
7572
actionpack (>= 3.0)
7673
activesupport (>= 3.0)
77-
sprockets (~> 2.8)
78-
sqlite3 (1.3.10)
79-
thor (0.18.1)
80-
thread_safe (0.1.0)
81-
atomic
82-
tilt (1.4.1)
83-
timecop (0.7.1)
84-
treetop (1.4.14)
85-
polyglot
86-
polyglot (>= 0.3.1)
87-
tzinfo (0.3.37)
74+
sprockets (>= 2.8, < 4.0)
75+
sqlite3 (1.3.11)
76+
thor (0.19.1)
77+
thread_safe (0.3.5)
78+
timecop (0.7.4)
79+
tzinfo (0.3.50)
8880

8981
PLATFORMS
9082
ruby
@@ -96,3 +88,6 @@ DEPENDENCIES
9688
rails (~> 4.0)
9789
sqlite3
9890
timecop (~> 0.7.1)
91+
92+
BUNDLED WITH
93+
1.12.5

0 commit comments

Comments
 (0)