Download as
Browse Code »

Commit 0a9dfbaa40de8f4de062066180c4be89abfe0891

Authored by Nathan Broadbent
1 parent ff659b9d
Exists in master and in 1 other branch production

Bumped Rails to 3.0.10, and updated actionmailer_inline_css

Showing 2 changed files with 44 additions and 41 deletions   Show diff stats
Gemfile
  Diff comments   View file @0a9dfba
1 1 source 'http://rubygems.org'
2 2  
3   -gem 'rails', '3.0.5'
  3 +gem 'rails', '3.0.10'
4 4 gem 'nokogiri'
5 5 gem 'mongoid', '2.1.2'
6 6 gem 'haml'
... ... @@ -16,7 +16,7 @@ gem 'octokit'
16 16 gem 'inherited_resources'
17 17 gem 'SystemTimer', :platform => :ruby_18
18 18 gem 'hoptoad_notifier', "~> 2.4"
19   -gem 'actionmailer_inline_css', ">= 1.0.0"
  19 +gem 'actionmailer_inline_css', ">= 1.0.1"
20 20  
21 21 platform :ruby do
22 22 gem 'bson_ext', '~> 1.3.1'
... ...
Gemfile.lock
  Diff comments   View file @0a9dfba
... ... @@ -10,39 +10,39 @@ GEM
10 10 specs:
11 11 SystemTimer (1.2.3)
12 12 abstract (1.0.0)
13   - actionmailer (3.0.5)
14   - actionpack (= 3.0.5)
15   - mail (~> 2.2.15)
16   - actionmailer_inline_css (1.0.0)
  13 + actionmailer (3.0.10)
  14 + actionpack (= 3.0.10)
  15 + mail (~> 2.2.19)
  16 + actionmailer_inline_css (1.0.1)
17 17 actionmailer (>= 3.0.0)
18 18 nokogiri (>= 1.4.4)
19 19 premailer (>= 1.7.1)
20   - actionpack (3.0.5)
21   - activemodel (= 3.0.5)
22   - activesupport (= 3.0.5)
  20 + actionpack (3.0.10)
  21 + activemodel (= 3.0.10)
  22 + activesupport (= 3.0.10)
23 23 builder (~> 2.1.2)
24 24 erubis (~> 2.6.6)
25   - i18n (~> 0.4)
  25 + i18n (~> 0.5.0)
26 26 rack (~> 1.2.1)
27   - rack-mount (~> 0.6.13)
  27 + rack-mount (~> 0.6.14)
28 28 rack-test (~> 0.5.7)
29 29 tzinfo (~> 0.3.23)
30   - activemodel (3.0.5)
31   - activesupport (= 3.0.5)
  30 + activemodel (3.0.10)
  31 + activesupport (= 3.0.10)
32 32 builder (~> 2.1.2)
33   - i18n (~> 0.4)
34   - activerecord (3.0.5)
35   - activemodel (= 3.0.5)
36   - activesupport (= 3.0.5)
37   - arel (~> 2.0.2)
  33 + i18n (~> 0.5.0)
  34 + activerecord (3.0.10)
  35 + activemodel (= 3.0.10)
  36 + activesupport (= 3.0.10)
  37 + arel (~> 2.0.10)
38 38 tzinfo (~> 0.3.23)
39   - activeresource (3.0.5)
40   - activemodel (= 3.0.5)
41   - activesupport (= 3.0.5)
42   - activesupport (3.0.5)
  39 + activeresource (3.0.10)
  40 + activemodel (= 3.0.10)
  41 + activesupport (= 3.0.10)
  42 + activesupport (3.0.10)
43 43 addressable (2.2.5)
44 44 archive-tar-minitar (0.5.2)
45   - arel (2.0.9)
  45 + arel (2.0.10)
46 46 bcrypt-ruby (2.1.4)
47 47 bson (1.3.1)
48 48 bson_ext (1.3.1)
... ... @@ -93,7 +93,7 @@ GEM
93 93 rbx-require-relative (> 0.0.4)
94 94 linecache19 (0.5.12)
95 95 ruby_core_source (>= 0.1.4)
96   - mail (2.2.17)
  96 + mail (2.2.19)
97 97 activesupport (>= 2.3.6)
98 98 i18n (>= 0.4.0)
99 99 mime-types (~> 1.16)
... ... @@ -126,32 +126,34 @@ GEM
126 126 happymapper (>= 0.2.4)
127 127 nokogiri (~> 1.4.1)
128 128 rest-client (~> 1.5.1)
129   - polyglot (0.3.1)
  129 + polyglot (0.3.2)
130 130 premailer (1.7.1)
131 131 css_parser (>= 1.1.9)
132 132 htmlentities (>= 4.0.0)
133   - rack (1.2.2)
  133 + rack (1.2.3)
134 134 rack-mount (0.6.14)
135 135 rack (>= 1.0.0)
136 136 rack-test (0.5.7)
137 137 rack (>= 1.0)
138   - rails (3.0.5)
139   - actionmailer (= 3.0.5)
140   - actionpack (= 3.0.5)
141   - activerecord (= 3.0.5)
142   - activeresource (= 3.0.5)
143   - activesupport (= 3.0.5)
  138 + rails (3.0.10)
  139 + actionmailer (= 3.0.10)
  140 + actionpack (= 3.0.10)
  141 + activerecord (= 3.0.10)
  142 + activeresource (= 3.0.10)
  143 + activesupport (= 3.0.10)
144 144 bundler (~> 1.0)
145   - railties (= 3.0.5)
146   - railties (3.0.5)
147   - actionpack (= 3.0.5)
148   - activesupport (= 3.0.5)
  145 + railties (= 3.0.10)
  146 + railties (3.0.10)
  147 + actionpack (= 3.0.10)
  148 + activesupport (= 3.0.10)
149 149 rake (>= 0.8.7)
  150 + rdoc (~> 3.4)
150 151 thor (~> 0.14.4)
151   - rake (0.8.7)
  152 + rake (0.9.2)
152 153 rash (0.3.0)
153 154 hashie (~> 1.0.0)
154 155 rbx-require-relative (0.0.5)
  156 + rdoc (3.9.4)
155 157 responders (0.6.4)
156 158 rest-client (1.5.1)
157 159 mime-types (>= 1.16)
... ... @@ -191,12 +193,13 @@ GEM
191 193 eventmachine (>= 0.12.6)
192 194 rack (>= 1.0.0)
193 195 thor (0.14.6)
194   - treetop (1.4.9)
  196 + treetop (1.4.10)
  197 + polyglot
195 198 polyglot (>= 0.3.1)
196 199 typhoeus (0.2.4)
197 200 mime-types
198 201 mime-types
199   - tzinfo (0.3.26)
  202 + tzinfo (0.3.29)
200 203 useragent (0.3.1)
201 204 warden (1.0.5)
202 205 rack (>= 1.0)
... ... @@ -210,7 +213,7 @@ PLATFORMS
210 213  
211 214 DEPENDENCIES
212 215 SystemTimer
213   - actionmailer_inline_css (>= 1.0.0)
  216 + actionmailer_inline_css (>= 1.0.1)
214 217 bson_ext (~> 1.3.1)
215 218 database_cleaner (~> 0.6.0)
216 219 devise (~> 1.4.0)
... ... @@ -225,7 +228,7 @@ DEPENDENCIES
225 228 nokogiri
226 229 octokit
227 230 pivotal-tracker
228   - rails (= 3.0.5)
  231 + rails (= 3.0.10)
229 232 redmine_client!
230 233 rspec (~> 2.5)
231 234 rspec-rails (~> 2.5)
... ...