Download as
Browse Code »

Commit 33478426feb5d6f86fc3031d26ae7b0e532c4f19

Authored by Antonio Terceiro
1 parent cdb2a371
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Update to rails 3.2.19

Showing 1 changed file with 45 additions and 44 deletions   Show diff stats
Gemfile.lock
  Diff comments   View file @3347842
... ... @@ -7,36 +7,36 @@ GEM
7 7 remote: https://rubygems.org/
8 8 specs:
9 9 RedCloth (4.2.9)
10   - actionmailer (3.2.6)
11   - actionpack (= 3.2.6)
12   - mail (~> 2.4.4)
13   - actionpack (3.2.6)
14   - activemodel (= 3.2.6)
15   - activesupport (= 3.2.6)
16   - builder (~> 3.0.0)
  10 + actionmailer (3.2.19)
  11 + actionpack (= 3.2.19)
  12 + mail (~> 2.5.4)
  13 + actionpack (3.2.19)
  14 + activemodel (= 3.2.19)
  15 + activesupport (= 3.2.19)
  16 + builder (~> 3.0)
17 17 erubis (~> 2.7.0)
18   - journey (~> 1.0.1)
19   - rack (~> 1.4.0)
  18 + journey (~> 1.0.4)
  19 + rack (~> 1.4.5)
20 20 rack-cache (~> 1.2)
21 21 rack-test (~> 0.6.1)
22   - sprockets (~> 2.1.3)
23   - activemodel (3.2.6)
24   - activesupport (= 3.2.6)
25   - builder (~> 3.0.0)
26   - activerecord (3.2.6)
27   - activemodel (= 3.2.6)
28   - activesupport (= 3.2.6)
29   - arel (~> 3.0.2)
30   - tzinfo (~> 0.3.29)
31   - activeresource (3.2.6)
32   - activemodel (= 3.2.6)
33   - activesupport (= 3.2.6)
34   - activesupport (3.2.6)
35   - i18n (~> 0.6)
  22 + sprockets (~> 2.2)
  23 + activemodel (3.2.19)
  24 + activesupport (= 3.2.19)
  25 + builder (~> 3.0)
  26 + activerecord (3.2.19)
  27 + activemodel (= 3.2.19)
  28 + activesupport (= 3.2.19)
  29 + arel (~> 4.0)
  30 + tzinfo (~> 1.0)
  31 + activeresource (3.2.19)
  32 + activemodel (= 3.2.19)
  33 + activesupport (= 3.2.19)
  34 + activesupport (3.2.19)
  35 + i18n (~> 0.6, >= 0.6.4)
36 36 multi_json (~> 1.0)
37 37 acts-as-taggable-on (3.0.2)
38 38 rails (>= 3, < 5)
39   - arel (3.0.2)
  39 + arel (4.0.0)
40 40 builder (3.0.0)
41 41 capybara (2.1.0)
42 42 mime-types (>= 1.16)
... ... @@ -73,17 +73,16 @@ GEM
73 73 json (>= 1.4.6)
74 74 hike (1.2.1)
75 75 hpricot (0.8.6)
76   - i18n (0.6.0)
77   - journey (1.0.3)
  76 + i18n (0.6.9)
  77 + journey (1.0.4)
78 78 json (1.7.3)
79 79 locale (2.0.5)
80   - mail (2.4.4)
81   - i18n (>= 0.4.0)
  80 + mail (2.5.4)
82 81 mime-types (~> 1.16)
83 82 treetop (~> 1.4.8)
84 83 metaclass (0.0.1)
85   - mime-types (1.19)
86   - mocha (0.11.3)
  84 + mime-types (1.25)
  85 + mocha (1.1.0)
87 86 metaclass (~> 0.0.1)
88 87 multi_json (1.3.6)
89 88 nokogiri (1.5.5)
... ... @@ -91,29 +90,29 @@ GEM
91 90 polyglot (0.3.3)
92 91 prototype-rails (3.2.1)
93 92 rails (~> 3.2)
94   - rack (1.4.1)
  93 + rack (1.4.5)
95 94 rack-cache (1.2)
96 95 rack (>= 0.4)
97 96 rack-ssl (1.3.2)
98 97 rack
99 98 rack-test (0.6.1)
100 99 rack (>= 1.0)
101   - rails (3.2.6)
102   - actionmailer (= 3.2.6)
103   - actionpack (= 3.2.6)
104   - activerecord (= 3.2.6)
105   - activeresource (= 3.2.6)
106   - activesupport (= 3.2.6)
  100 + rails (3.2.19)
  101 + actionmailer (= 3.2.19)
  102 + actionpack (= 3.2.19)
  103 + activerecord (= 3.2.19)
  104 + activeresource (= 3.2.19)
  105 + activesupport (= 3.2.19)
107 106 bundler (~> 1.0)
108   - railties (= 3.2.6)
  107 + railties (= 3.2.19)
109 108 rails_autolink (1.1.5)
110 109 rails (> 3.1)
111   - railties (3.2.6)
112   - actionpack (= 3.2.6)
113   - activesupport (= 3.2.6)
  110 + railties (3.2.19)
  111 + actionpack (= 3.2.19)
  112 + activesupport (= 3.2.19)
114 113 rack-ssl (~> 1.3.2)
115 114 rake (>= 0.8.7)
116   - rdoc (~> 3.4)
  115 + rdoc (>= 3.4)
117 116 thor (>= 0.14.6, < 2.0)
118 117 rake (0.9.2.2)
119 118 rdoc (3.9.4)
... ... @@ -140,7 +139,7 @@ GEM
140 139 multi_json (~> 1.0)
141 140 rubyzip (~> 1.0)
142 141 websocket (~> 1.0.4)
143   - sprockets (2.1.3)
  142 + sprockets (2.4.3)
144 143 hike (~> 1.2)
145 144 multi_json (~> 1.0)
146 145 rack (~> 1.0)
... ... @@ -151,11 +150,13 @@ GEM
151 150 eventmachine (>= 0.12.6)
152 151 rack (>= 1.0.0)
153 152 thor (0.15.3)
  153 + thread_safe (0.3.3)
154 154 tilt (1.3.3)
155 155 treetop (1.4.10)
156 156 polyglot
157 157 polyglot (>= 0.3.1)
158   - tzinfo (0.3.33)
  158 + tzinfo (1.1.0)
  159 + thread_safe (~> 0.1)
159 160 websocket (1.0.7)
160 161 will_paginate (3.0.3)
161 162 xpath (2.0.0)
... ...