Download as
Browse Code »

Commit 5759f97598d0595d6b550416513a96356bbd772d

Authored by Dmitriy Zaporozhets
2 parents db84a5b1 93f3fede
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #908 from avakarev/update-rails-to-3.2.5 

Update rails version to 3.2.5
Showing 2 changed files with 63 additions and 61 deletions   Show diff stats
Gemfile
  Diff comments   View file @5759f97
1 1 source "http://rubygems.org"
2 2  
3   -gem "rails", "3.2.3"
  3 +gem "rails", "3.2.5"
4 4  
5 5 gem "sqlite3"
6 6 gem "mysql2"
... ... @@ -8,7 +8,6 @@ gem "devise", "~> 1.5"
8 8 gem "stamp"
9 9 gem "kaminari"
10 10 gem "haml-rails"
11   -gem "jquery-rails"
12 11 gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "9536f306645f2d6b1f993ae02d3a29893ba8881f"
13 12 gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
14 13 gem "carrierwave"
... ... @@ -29,18 +28,20 @@ gem "httparty"
29 28 gem "charlock_holmes"
30 29 gem "foreman"
31 30 gem "omniauth-ldap"
32   -gem 'bootstrap-sass', "2.0.3"
  31 +gem 'bootstrap-sass', "2.0.3.1"
33 32 gem "colored"
34 33 gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
35 34 gem 'modularity'
36 35 gem 'resque_mailer'
37 36 gem 'chosen-rails'
38   -gem 'modernizr'
39   -gem 'graphael-rails'
40   -gem 'jquery-ui-rails'
  37 +
  38 +gem "jquery-rails", "2.0.2"
  39 +gem "jquery-ui-rails", "0.5.0"
  40 +gem "modernizr", "2.5.3"
  41 +gem "graphael-rails", "0.1.4"
41 42  
42 43 group :assets do
43   - gem "sass-rails", "3.2.3"
  44 + gem "sass-rails", "3.2.5"
44 45 gem "coffee-rails", "3.2.2"
45 46 gem "uglifier", "1.0.3"
46 47 gem "therubyracer"
... ...
Gemfile.lock
  Diff comments   View file @5759f97
... ... @@ -49,32 +49,32 @@ GIT
49 49 GEM
50 50 remote: http://rubygems.org/
51 51 specs:
52   - ZenTest (4.8.0)
53   - actionmailer (3.2.3)
54   - actionpack (= 3.2.3)
  52 + ZenTest (4.8.1)
  53 + actionmailer (3.2.5)
  54 + actionpack (= 3.2.5)
55 55 mail (~> 2.4.4)
56   - actionpack (3.2.3)
57   - activemodel (= 3.2.3)
58   - activesupport (= 3.2.3)
  56 + actionpack (3.2.5)
  57 + activemodel (= 3.2.5)
  58 + activesupport (= 3.2.5)
59 59 builder (~> 3.0.0)
60 60 erubis (~> 2.7.0)
61 61 journey (~> 1.0.1)
62 62 rack (~> 1.4.0)
63 63 rack-cache (~> 1.2)
64 64 rack-test (~> 0.6.1)
65   - sprockets (~> 2.1.2)
66   - activemodel (3.2.3)
67   - activesupport (= 3.2.3)
  65 + sprockets (~> 2.1.3)
  66 + activemodel (3.2.5)
  67 + activesupport (= 3.2.5)
68 68 builder (~> 3.0.0)
69   - activerecord (3.2.3)
70   - activemodel (= 3.2.3)
71   - activesupport (= 3.2.3)
  69 + activerecord (3.2.5)
  70 + activemodel (= 3.2.5)
  71 + activesupport (= 3.2.5)
72 72 arel (~> 3.0.2)
73 73 tzinfo (~> 0.3.29)
74   - activeresource (3.2.3)
75   - activemodel (= 3.2.3)
76   - activesupport (= 3.2.3)
77   - activesupport (3.2.3)
  74 + activeresource (3.2.5)
  75 + activemodel (= 3.2.5)
  76 + activesupport (= 3.2.5)
  77 + activesupport (3.2.5)
78 78 i18n (~> 0.6)
79 79 multi_json (~> 1.0)
80 80 acts-as-taggable-on (2.1.1)
... ... @@ -90,7 +90,7 @@ GEM
90 90 awesome_print (1.0.2)
91 91 bcrypt-ruby (3.0.1)
92 92 blankslate (2.1.2.4)
93   - bootstrap-sass (2.0.3)
  93 + bootstrap-sass (2.0.3.1)
94 94 builder (3.0.0)
95 95 capybara (1.1.2)
96 96 mime-types (>= 1.16)
... ... @@ -115,11 +115,11 @@ GEM
115 115 coffee-script (2.2.0)
116 116 coffee-script-source
117 117 execjs
118   - coffee-script-source (1.3.1)
  118 + coffee-script-source (1.3.3)
119 119 colored (1.2)
120 120 crack (0.3.1)
121 121 daemons (1.1.8)
122   - database_cleaner (0.7.2)
  122 + database_cleaner (0.8.0)
123 123 devise (1.5.3)
124 124 bcrypt-ruby (~> 3.0)
125 125 orm_adapter (~> 0.0.3)
... ... @@ -132,16 +132,16 @@ GEM
132 132 erubis (2.7.0)
133 133 escape_utils (0.2.4)
134 134 eventmachine (0.12.10)
135   - execjs (1.3.2)
  135 + execjs (1.4.0)
136 136 multi_json (~> 1.0)
137 137 ffaker (1.14.0)
138 138 ffi (1.0.11)
139   - foreman (0.46.0)
  139 + foreman (0.47.0)
140 140 thor (>= 0.13.6)
141 141 git (1.2.5)
142 142 graphael-rails (0.1.4)
143 143 jeweler
144   - haml (3.1.4)
  144 + haml (3.1.6)
145 145 haml-rails (0.3.4)
146 146 actionpack (~> 3.0)
147 147 activesupport (~> 3.0)
... ... @@ -163,10 +163,10 @@ GEM
163 163 jquery-rails (2.0.2)
164 164 railties (>= 3.2.0, < 5.0)
165 165 thor (~> 0.14)
166   - jquery-ui-rails (0.4.0)
  166 + jquery-ui-rails (0.5.0)
167 167 jquery-rails
168 168 railties (>= 3.1.0)
169   - json (1.7.1)
  169 + json (1.7.3)
170 170 kaminari (0.13.0)
171 171 actionpack (>= 3.0.0)
172 172 activesupport (>= 3.0.0)
... ... @@ -188,11 +188,11 @@ GEM
188 188 modernizr (2.5.3)
189 189 sprockets (~> 2.0)
190 190 modularity (0.6.1)
191   - multi_json (1.3.4)
  191 + multi_json (1.3.6)
192 192 multi_xml (0.5.1)
193 193 mysql2 (0.3.11)
194 194 net-ldap (0.2.2)
195   - nokogiri (1.5.2)
  195 + nokogiri (1.5.3)
196 196 omniauth (1.1.0)
197 197 hashie (~> 1.2)
198 198 rack
... ... @@ -218,24 +218,24 @@ GEM
218 218 rack
219 219 rack-test (0.6.1)
220 220 rack (>= 1.0)
221   - rails (3.2.3)
222   - actionmailer (= 3.2.3)
223   - actionpack (= 3.2.3)
224   - activerecord (= 3.2.3)
225   - activeresource (= 3.2.3)
226   - activesupport (= 3.2.3)
  221 + rails (3.2.5)
  222 + actionmailer (= 3.2.5)
  223 + actionpack (= 3.2.5)
  224 + activerecord (= 3.2.5)
  225 + activeresource (= 3.2.5)
  226 + activesupport (= 3.2.5)
227 227 bundler (~> 1.0)
228   - railties (= 3.2.3)
  228 + railties (= 3.2.5)
229 229 rails-footnotes (3.7.8)
230 230 rails (>= 3.0.0)
231   - railties (3.2.3)
232   - actionpack (= 3.2.3)
233   - activesupport (= 3.2.3)
  231 + railties (3.2.5)
  232 + actionpack (= 3.2.5)
  233 + activesupport (= 3.2.5)
234 234 rack-ssl (~> 1.3.2)
235 235 rake (>= 0.8.7)
236 236 rdoc (~> 3.4)
237   - thor (~> 0.14.6)
238   - raindrops (0.8.0)
  237 + thor (>= 0.14.6, < 2.0)
  238 + raindrops (0.9.0)
239 239 rake (0.9.2.2)
240 240 rdoc (3.12)
241 241 json (~> 1.4)
... ... @@ -255,7 +255,7 @@ GEM
255 255 rspec-core (~> 2.10.0)
256 256 rspec-expectations (~> 2.10.0)
257 257 rspec-mocks (~> 2.10.0)
258   - rspec-core (2.10.0)
  258 + rspec-core (2.10.1)
259 259 rspec-expectations (2.10.0)
260 260 diff-lcs (~> 1.1.3)
261 261 rspec-mocks (2.10.1)
... ... @@ -265,25 +265,26 @@ GEM
265 265 railties (>= 3.0)
266 266 rspec (~> 2.10.0)
267 267 rubyntlm (0.1.1)
268   - rubypython (0.6.1)
  268 + rubypython (0.6.2)
269 269 blankslate (>= 2.1.2.3)
270 270 ffi (~> 1.0.7)
271 271 rubyzip (0.9.8)
272   - sass (3.1.17)
273   - sass-rails (3.2.3)
274   - railties (~> 3.2.0.beta)
  272 + sass (3.1.19)
  273 + sass-rails (3.2.5)
  274 + railties (~> 3.2.0)
275 275 sass (>= 3.1.10)
276 276 tilt (~> 1.3)
277 277 seed-fu (2.2.0)
278 278 activerecord (~> 3.1)
279 279 activesupport (~> 3.1)
280   - selenium-webdriver (2.21.2)
  280 + selenium-webdriver (2.22.2)
281 281 childprocess (>= 0.2.5)
282 282 ffi (~> 1.0)
283 283 libwebsocket (~> 0.1.3)
284 284 multi_json (~> 1.0)
285 285 rubyzip
286   - shoulda-matchers (1.0.0)
  286 + shoulda-matchers (1.1.0)
  287 + activesupport (>= 3.0.0)
287 288 simplecov (0.6.4)
288 289 multi_json (~> 1.0)
289 290 simplecov-html (~> 0.5.3)
... ... @@ -306,7 +307,7 @@ GEM
306 307 daemons (>= 1.0.9)
307 308 eventmachine (>= 0.12.6)
308 309 rack (>= 1.0.0)
309   - thor (0.14.6)
  310 + thor (0.15.2)
310 311 tilt (1.3.3)
311 312 treetop (1.4.10)
312 313 polyglot
... ... @@ -325,7 +326,7 @@ GEM
325 326 rack (>= 1.0.0)
326 327 warden (1.2.0)
327 328 rack (>= 1.0)
328   - webmock (1.8.6)
  329 + webmock (1.8.7)
329 330 addressable (>= 2.2.7)
330 331 crack (>= 0.1.7)
331 332 xpath (0.1.4)
... ... @@ -341,7 +342,7 @@ DEPENDENCIES
341 342 autotest
342 343 autotest-rails
343 344 awesome_print
344   - bootstrap-sass (= 2.0.3)
  345 + bootstrap-sass (= 2.0.3.1)
345 346 capybara
346 347 carrierwave
347 348 charlock_holmes
... ... @@ -356,29 +357,29 @@ DEPENDENCIES
356 357 foreman
357 358 git
358 359 gitolite!
359   - graphael-rails
  360 + graphael-rails (= 0.1.4)
360 361 grit!
361 362 haml-rails
362 363 httparty
363   - jquery-rails
364   - jquery-ui-rails
  364 + jquery-rails (= 2.0.2)
  365 + jquery-ui-rails (= 0.5.0)
365 366 kaminari
366 367 launchy
367 368 letter_opener
368 369 linguist (~> 1.0.0)!
369   - modernizr
  370 + modernizr (= 2.5.3)
370 371 modularity
371 372 mysql2
372 373 omniauth-ldap
373 374 pry
374 375 pygments.rb (= 0.2.12)!
375   - rails (= 3.2.3)
  376 + rails (= 3.2.5)
376 377 rails-footnotes
377 378 redcarpet (~> 2.1.1)
378 379 resque (~> 1.20.0)
379 380 resque_mailer
380 381 rspec-rails
381   - sass-rails (= 3.2.3)
  382 + sass-rails (= 3.2.5)
382 383 seed-fu
383 384 shoulda-matchers
384 385 simplecov
... ...