Download as
Browse Code »

Commit 5a3dc46e2326eafc993498044e5393d245b0d59c

Authored by Barry Hess
1 parent f2b9af95
Exists in master and in 1 other branch production

Trying not to stomp on Gemfile.lock. How rude.

Showing 1 changed file with 37 additions and 38 deletions   Show diff stats
Gemfile.lock
  Diff comments   View file @5a3dc46
... ... @@ -35,12 +35,12 @@ GEM
35 35 activemodel (= 3.0.5)
36 36 activesupport (= 3.0.5)
37 37 activesupport (3.0.5)
38   - addressable (2.2.6)
39   - arel (2.0.10)
  38 + addressable (2.2.5)
  39 + arel (2.0.9)
40 40 awesome_print (0.4.0)
41 41 bcrypt-ruby (2.1.4)
42   - bson (1.3.1)
43   - bson_ext (1.3.1)
  42 + bson (1.3.0)
  43 + bson_ext (1.3.0)
44 44 builder (2.1.2)
45 45 crack (0.1.8)
46 46 database_cleaner (0.6.7)
... ... @@ -48,8 +48,7 @@ GEM
48 48 bcrypt-ruby (~> 2.1.2)
49 49 warden (~> 1.0.2)
50 50 diff-lcs (1.1.2)
51   - email_spec (1.2.1)
52   - mail (~> 2.2)
  51 + email_spec (1.1.1)
53 52 rspec (~> 2.0)
54 53 erubis (2.6.6)
55 54 abstract (>= 1.0.0)
... ... @@ -57,40 +56,40 @@ GEM
57 56 factory_girl_rails (1.0.1)
58 57 factory_girl (~> 1.3)
59 58 railties (>= 3.0.0)
60   - haml (3.1.2)
  59 + haml (3.0.25)
61 60 happymapper (0.3.2)
62 61 libxml-ruby (~> 1.1.3)
63   - i18n (0.6.0)
  62 + i18n (0.5.0)
64 63 libxml-ruby (1.1.4)
65 64 lighthouse-api (2.0)
66 65 activeresource (>= 3.0.0)
67 66 activesupport (>= 3.0.0)
68   - mail (2.2.19)
  67 + mail (2.2.17)
69 68 activesupport (>= 2.3.6)
70 69 i18n (>= 0.4.0)
71 70 mime-types (~> 1.16)
72 71 treetop (~> 1.4.8)
73 72 mime-types (1.16)
74   - mongo (1.3.1)
75   - bson (>= 1.3.1)
  73 + mongo (1.3.0)
  74 + bson (>= 1.3.0)
76 75 mongoid (2.0.0.rc.8)
77 76 activemodel (~> 3.0)
78 77 mongo (~> 1.2)
79 78 tzinfo (~> 0.3.22)
80 79 will_paginate (~> 3.0.pre)
81   - mongoid_rails_migrations (0.0.14)
82   - activesupport (>= 3.0.0)
83   - bundler (>= 1.0.0)
84   - rails (>= 3.0.0)
85   - railties (>= 3.0.0)
86   - nokogiri (1.4.3.1)
87   - pivotal-tracker (0.3.1)
  80 + mongoid_rails_migrations (0.0.10)
  81 + activesupport (~> 3.0.0)
  82 + bundler (>= 0.9.19)
  83 + rails (~> 3.0.0)
  84 + railties (~> 3.0.0)
  85 + nokogiri (1.4.4)
  86 + pivotal-tracker (0.2.0)
88 87 builder
89   - happymapper (>= 0.3.2)
90   - nokogiri (~> 1.4.3.1)
91   - rest-client (~> 1.6.0)
  88 + happymapper (>= 0.2.4)
  89 + nokogiri (~> 1.4.1)
  90 + rest-client (~> 1.5.1)
92 91 polyglot (0.3.1)
93   - rack (1.2.3)
  92 + rack (1.2.2)
94 93 rack-mount (0.6.14)
95 94 rack (>= 1.0.0)
96 95 rack-test (0.5.7)
... ... @@ -108,31 +107,31 @@ GEM
108 107 activesupport (= 3.0.5)
109 108 rake (>= 0.8.7)
110 109 thor (~> 0.14.4)
111   - rake (0.9.2)
112   - rest-client (1.6.3)
  110 + rake (0.8.7)
  111 + rest-client (1.5.1)
113 112 mime-types (>= 1.16)
114   - rspec (2.6.0)
115   - rspec-core (~> 2.6.0)
116   - rspec-expectations (~> 2.6.0)
117   - rspec-mocks (~> 2.6.0)
118   - rspec-core (2.6.4)
119   - rspec-expectations (2.6.0)
  113 + rspec (2.5.0)
  114 + rspec-core (~> 2.5.0)
  115 + rspec-expectations (~> 2.5.0)
  116 + rspec-mocks (~> 2.5.0)
  117 + rspec-core (2.5.1)
  118 + rspec-expectations (2.5.0)
120 119 diff-lcs (~> 1.1.2)
121   - rspec-mocks (2.6.0)
122   - rspec-rails (2.6.1)
  120 + rspec-mocks (2.5.0)
  121 + rspec-rails (2.5.0)
123 122 actionpack (~> 3.0)
124 123 activesupport (~> 3.0)
125 124 railties (~> 3.0)
126   - rspec (~> 2.6.0)
  125 + rspec (~> 2.5.0)
127 126 thor (0.14.6)
128 127 treetop (1.4.9)
129 128 polyglot (>= 0.3.1)
130   - tzinfo (0.3.28)
  129 + tzinfo (0.3.26)
131 130 useragent (0.3.1)
132   - warden (1.0.4)
133   - rack (>= 1.0)
134   - webmock (1.6.4)
135   - addressable (~> 2.2, > 2.2.5)
  131 + warden (1.0.3)
  132 + rack (>= 1.0.0)
  133 + webmock (1.6.2)
  134 + addressable (>= 2.2.2)
136 135 crack (>= 0.1.7)
137 136 will_paginate (3.0.pre2)
138 137  
... ...