Commit 0a3874f6a30d50da170d4cf43abc51a43b696d33

Authored by Valeriy Sizov
2 parents 02752428 d0eaca91

Merge pull request #807 from robbkidd/update_the_gems

Updated gems. Specs all still pass. (Devise pinned to 1.x)
Showing 2 changed files with 59 additions and 57 deletions   Show diff stats
@@ -5,7 +5,7 @@ gem "rails", "3.2.3" @@ -5,7 +5,7 @@ gem "rails", "3.2.3"
5 gem "sqlite3" 5 gem "sqlite3"
6 gem "mysql2" 6 gem "mysql2"
7 gem "rake" 7 gem "rake"
8 -gem "devise" 8 +gem "devise", "~> 1.5"
9 gem "stamp" 9 gem "stamp"
10 gem "kaminari" 10 gem "kaminari"
11 gem "haml", "3.1.4" 11 gem "haml", "3.1.4"
1 GIT 1 GIT
2 remote: https://github.com/ctran/annotate_models.git 2 remote: https://github.com/ctran/annotate_models.git
3 - revision: a43c08f0eb4d69a48c6830630ebb60e35ccb2d2d 3 + revision: 18cd39ad01829deba5aa34634b8540d6675ab978
4 specs: 4 specs:
5 annotate (2.4.1.beta1) 5 annotate (2.4.1.beta1)
6 6
@@ -40,7 +40,7 @@ GIT @@ -40,7 +40,7 @@ GIT
40 GEM 40 GEM
41 remote: http://rubygems.org/ 41 remote: http://rubygems.org/
42 specs: 42 specs:
43 - ZenTest (4.5.0) 43 + ZenTest (4.8.0)
44 actionmailer (3.2.3) 44 actionmailer (3.2.3)
45 actionpack (= 3.2.3) 45 actionpack (= 3.2.3)
46 mail (~> 2.4.4) 46 mail (~> 2.4.4)
@@ -70,14 +70,14 @@ GEM @@ -70,14 +70,14 @@ GEM
70 multi_json (~> 1.0) 70 multi_json (~> 1.0)
71 acts-as-taggable-on (2.1.1) 71 acts-as-taggable-on (2.1.1)
72 rails 72 rails
73 - acts_as_list (0.1.4) 73 + acts_as_list (0.1.6)
74 addressable (2.2.8) 74 addressable (2.2.8)
75 ansi (1.4.2) 75 ansi (1.4.2)
76 arel (3.0.2) 76 arel (3.0.2)
77 autotest (4.4.6) 77 autotest (4.4.6)
78 ZenTest (>= 4.4.1) 78 ZenTest (>= 4.4.1)
79 - autotest-rails (4.1.1)  
80 - ZenTest (= 4.5) 79 + autotest-rails (4.1.2)
  80 + ZenTest (~> 4.5)
81 awesome_print (1.0.2) 81 awesome_print (1.0.2)
82 bcrypt-ruby (3.0.1) 82 bcrypt-ruby (3.0.1)
83 blankslate (2.1.2.4) 83 blankslate (2.1.2.4)
@@ -90,12 +90,13 @@ GEM @@ -90,12 +90,13 @@ GEM
90 rack-test (>= 0.5.4) 90 rack-test (>= 0.5.4)
91 selenium-webdriver (~> 2.0) 91 selenium-webdriver (~> 2.0)
92 xpath (~> 0.1.4) 92 xpath (~> 0.1.4)
93 - carrierwave (0.5.8)  
94 - activesupport (~> 3.0) 93 + carrierwave (0.6.2)
  94 + activemodel (>= 3.2.0)
  95 + activesupport (>= 3.2.0)
95 charlock_holmes (0.6.8) 96 charlock_holmes (0.6.8)
96 - childprocess (0.3.1) 97 + childprocess (0.3.2)
97 ffi (~> 1.0.6) 98 ffi (~> 1.0.6)
98 - coderay (1.0.5) 99 + coderay (1.0.6)
99 coffee-rails (3.2.2) 100 coffee-rails (3.2.2)
100 coffee-script (>= 2.2.0) 101 coffee-script (>= 2.2.0)
101 railties (~> 3.2.0) 102 railties (~> 3.2.0)
@@ -106,8 +107,8 @@ GEM @@ -106,8 +107,8 @@ GEM
106 colored (1.2) 107 colored (1.2)
107 crack (0.3.1) 108 crack (0.3.1)
108 daemons (1.1.8) 109 daemons (1.1.8)
109 - database_cleaner (0.7.1)  
110 - devise (1.5.0) 110 + database_cleaner (0.7.2)
  111 + devise (1.5.3)
111 bcrypt-ruby (~> 3.0) 112 bcrypt-ruby (~> 3.0)
112 orm_adapter (~> 0.0.3) 113 orm_adapter (~> 0.0.3)
113 warden (~> 1.1) 114 warden (~> 1.1)
@@ -116,13 +117,12 @@ GEM @@ -116,13 +117,12 @@ GEM
116 erubis (2.7.0) 117 erubis (2.7.0)
117 escape_utils (0.2.4) 118 escape_utils (0.2.4)
118 eventmachine (0.12.10) 119 eventmachine (0.12.10)
119 - execjs (1.3.0) 120 + execjs (1.3.2)
120 multi_json (~> 1.0) 121 multi_json (~> 1.0)
121 faker (1.0.1) 122 faker (1.0.1)
122 i18n (~> 0.4) 123 i18n (~> 0.4)
123 ffi (1.0.11) 124 ffi (1.0.11)
124 - foreman (0.39.0)  
125 - term-ansicolor (~> 1.0.7) 125 + foreman (0.46.0)
126 thor (>= 0.13.6) 126 thor (>= 0.13.6)
127 git (1.2.5) 127 git (1.2.5)
128 haml (3.1.4) 128 haml (3.1.4)
@@ -134,38 +134,40 @@ GEM @@ -134,38 +134,40 @@ GEM
134 hashery (1.4.0) 134 hashery (1.4.0)
135 hashie (1.2.0) 135 hashie (1.2.0)
136 hike (1.2.1) 136 hike (1.2.1)
137 - httparty (0.8.1)  
138 - multi_json 137 + httparty (0.8.3)
  138 + multi_json (~> 1.0)
139 multi_xml 139 multi_xml
140 i18n (0.6.0) 140 i18n (0.6.0)
141 journey (1.0.3) 141 journey (1.0.3)
142 - jquery-rails (2.0.0)  
143 - railties (>= 3.2.0.beta, < 5.0) 142 + jquery-rails (2.0.2)
  143 + railties (>= 3.2.0, < 5.0)
144 thor (~> 0.14) 144 thor (~> 0.14)
145 - json (1.6.6) 145 + json (1.7.1)
146 kaminari (0.13.0) 146 kaminari (0.13.0)
147 actionpack (>= 3.0.0) 147 actionpack (>= 3.0.0)
148 activesupport (>= 3.0.0) 148 activesupport (>= 3.0.0)
149 railties (>= 3.0.0) 149 railties (>= 3.0.0)
150 - kgio (2.7.2) 150 + kgio (2.7.4)
151 launchy (2.1.0) 151 launchy (2.1.0)
152 addressable (~> 2.2.6) 152 addressable (~> 2.2.6)
153 letter_opener (0.0.2) 153 letter_opener (0.0.2)
154 launchy 154 launchy
155 libv8 (3.3.10.4) 155 libv8 (3.3.10.4)
  156 + libwebsocket (0.1.3)
  157 + addressable
156 mail (2.4.4) 158 mail (2.4.4)
157 i18n (>= 0.4.0) 159 i18n (>= 0.4.0)
158 mime-types (~> 1.16) 160 mime-types (~> 1.16)
159 treetop (~> 1.4.8) 161 treetop (~> 1.4.8)
160 - method_source (0.7.0) 162 + method_source (0.7.1)
161 mime-types (1.18) 163 mime-types (1.18)
162 modularity (0.6.1) 164 modularity (0.6.1)
163 - multi_json (1.0.4)  
164 - multi_xml (0.4.1) 165 + multi_json (1.3.4)
  166 + multi_xml (0.5.1)
165 mysql2 (0.3.11) 167 mysql2 (0.3.11)
166 net-ldap (0.2.2) 168 net-ldap (0.2.2)
167 - nokogiri (1.5.0)  
168 - omniauth (1.0.2) 169 + nokogiri (1.5.2)
  170 + omniauth (1.1.0)
169 hashie (~> 1.2) 171 hashie (~> 1.2)
170 rack 172 rack
171 omniauth-ldap (1.0.2) 173 omniauth-ldap (1.0.2)
@@ -173,12 +175,12 @@ GEM @@ -173,12 +175,12 @@ GEM
173 omniauth (~> 1.0) 175 omniauth (~> 1.0)
174 pyu-ruby-sasl (~> 0.0.3.1) 176 pyu-ruby-sasl (~> 0.0.3.1)
175 rubyntlm (~> 0.1.1) 177 rubyntlm (~> 0.1.1)
176 - orm_adapter (0.0.6) 178 + orm_adapter (0.0.7)
177 polyglot (0.3.3) 179 polyglot (0.3.3)
178 posix-spawn (0.3.6) 180 posix-spawn (0.3.6)
179 - pry (0.9.8.2) 181 + pry (0.9.9.6)
180 coderay (~> 1.0.5) 182 coderay (~> 1.0.5)
181 - method_source (~> 0.7) 183 + method_source (~> 0.7.1)
182 slop (>= 2.4.4, < 3) 184 slop (>= 2.4.4, < 3)
183 pygments.rb (0.2.11) 185 pygments.rb (0.2.11)
184 rubypython (~> 0.5.3) 186 rubypython (~> 0.5.3)
@@ -200,7 +202,7 @@ GEM @@ -200,7 +202,7 @@ GEM
200 activesupport (= 3.2.3) 202 activesupport (= 3.2.3)
201 bundler (~> 1.0) 203 bundler (~> 1.0)
202 railties (= 3.2.3) 204 railties (= 3.2.3)
203 - rails-footnotes (3.7.5) 205 + rails-footnotes (3.7.8)
204 rails (>= 3.0.0) 206 rails (>= 3.0.0)
205 railties (3.2.3) 207 railties (3.2.3)
206 actionpack (= 3.2.3) 208 actionpack (= 3.2.3)
@@ -222,25 +224,25 @@ GEM @@ -222,25 +224,25 @@ GEM
222 redis-namespace (~> 1.0.2) 224 redis-namespace (~> 1.0.2)
223 sinatra (>= 0.9.2) 225 sinatra (>= 0.9.2)
224 vegas (~> 0.1.2) 226 vegas (~> 0.1.2)
225 - rspec (2.8.0)  
226 - rspec-core (~> 2.8.0)  
227 - rspec-expectations (~> 2.8.0)  
228 - rspec-mocks (~> 2.8.0)  
229 - rspec-core (2.8.0)  
230 - rspec-expectations (2.8.0)  
231 - diff-lcs (~> 1.1.2)  
232 - rspec-mocks (2.8.0)  
233 - rspec-rails (2.8.1) 227 + rspec (2.10.0)
  228 + rspec-core (~> 2.10.0)
  229 + rspec-expectations (~> 2.10.0)
  230 + rspec-mocks (~> 2.10.0)
  231 + rspec-core (2.10.0)
  232 + rspec-expectations (2.10.0)
  233 + diff-lcs (~> 1.1.3)
  234 + rspec-mocks (2.10.1)
  235 + rspec-rails (2.10.1)
234 actionpack (>= 3.0) 236 actionpack (>= 3.0)
235 activesupport (>= 3.0) 237 activesupport (>= 3.0)
236 railties (>= 3.0) 238 railties (>= 3.0)
237 - rspec (~> 2.8.0) 239 + rspec (~> 2.10.0)
238 rubyntlm (0.1.1) 240 rubyntlm (0.1.1)
239 rubypython (0.5.3) 241 rubypython (0.5.3)
240 blankslate (>= 2.1.2.3) 242 blankslate (>= 2.1.2.3)
241 ffi (~> 1.0.7) 243 ffi (~> 1.0.7)
242 - rubyzip (0.9.6.1)  
243 - sass (3.1.15) 244 + rubyzip (0.9.8)
  245 + sass (3.1.17)
244 sass-rails (3.2.3) 246 sass-rails (3.2.3)
245 railties (~> 3.2.0.beta) 247 railties (~> 3.2.0.beta)
246 sass (>= 3.1.10) 248 sass (>= 3.1.10)
@@ -248,18 +250,19 @@ GEM @@ -248,18 +250,19 @@ GEM
248 seed-fu (2.2.0) 250 seed-fu (2.2.0)
249 activerecord (~> 3.1) 251 activerecord (~> 3.1)
250 activesupport (~> 3.1) 252 activesupport (~> 3.1)
251 - selenium-webdriver (2.19.0) 253 + selenium-webdriver (2.21.2)
252 childprocess (>= 0.2.5) 254 childprocess (>= 0.2.5)
253 - ffi (~> 1.0.9)  
254 - multi_json (~> 1.0.4) 255 + ffi (~> 1.0)
  256 + libwebsocket (~> 0.1.3)
  257 + multi_json (~> 1.0)
255 rubyzip 258 rubyzip
256 shoulda (3.0.1) 259 shoulda (3.0.1)
257 shoulda-context (~> 1.0.0) 260 shoulda-context (~> 1.0.0)
258 shoulda-matchers (~> 1.0.0) 261 shoulda-matchers (~> 1.0.0)
259 shoulda-context (1.0.0) 262 shoulda-context (1.0.0)
260 shoulda-matchers (1.0.0) 263 shoulda-matchers (1.0.0)
261 - simplecov (0.5.4)  
262 - multi_json (~> 1.0.3) 264 + simplecov (0.6.4)
  265 + multi_json (~> 1.0)
263 simplecov-html (~> 0.5.3) 266 simplecov-html (~> 0.5.3)
264 simplecov-html (0.5.3) 267 simplecov-html (0.5.3)
265 sinatra (1.3.2) 268 sinatra (1.3.2)
@@ -268,14 +271,13 @@ GEM @@ -268,14 +271,13 @@ GEM
268 tilt (~> 1.3, >= 1.3.3) 271 tilt (~> 1.3, >= 1.3.3)
269 six (0.2.0) 272 six (0.2.0)
270 slop (2.4.4) 273 slop (2.4.4)
271 - sprockets (2.1.2) 274 + sprockets (2.1.3)
272 hike (~> 1.2) 275 hike (~> 1.2)
273 rack (~> 1.0) 276 rack (~> 1.0)
274 tilt (~> 1.1, != 1.3.0) 277 tilt (~> 1.1, != 1.3.0)
275 - sqlite3 (1.3.5) 278 + sqlite3 (1.3.6)
276 stamp (0.1.6) 279 stamp (0.1.6)
277 - term-ansicolor (1.0.7)  
278 - therubyracer (0.9.9) 280 + therubyracer (0.10.1)
279 libv8 (~> 3.3.10) 281 libv8 (~> 3.3.10)
280 thin (1.3.1) 282 thin (1.3.1)
281 daemons (>= 1.0.9) 283 daemons (>= 1.0.9)
@@ -286,22 +288,22 @@ GEM @@ -286,22 +288,22 @@ GEM
286 treetop (1.4.10) 288 treetop (1.4.10)
287 polyglot 289 polyglot
288 polyglot (>= 0.3.1) 290 polyglot (>= 0.3.1)
289 - turn (0.9.2) 291 + turn (0.9.5)
290 ansi 292 ansi
291 tzinfo (0.3.33) 293 tzinfo (0.3.33)
292 uglifier (1.0.3) 294 uglifier (1.0.3)
293 execjs (>= 0.3.0) 295 execjs (>= 0.3.0)
294 multi_json (>= 1.0.2) 296 multi_json (>= 1.0.2)
295 - unicorn (4.2.0) 297 + unicorn (4.3.1)
296 kgio (~> 2.6) 298 kgio (~> 2.6)
297 rack 299 rack
298 raindrops (~> 0.7) 300 raindrops (~> 0.7)
299 vegas (0.1.11) 301 vegas (0.1.11)
300 rack (>= 1.0.0) 302 rack (>= 1.0.0)
301 - warden (1.1.0) 303 + warden (1.2.0)
302 rack (>= 1.0) 304 rack (>= 1.0)
303 - webmock (1.7.10)  
304 - addressable (~> 2.2, > 2.2.5) 305 + webmock (1.8.6)
  306 + addressable (>= 2.2.7)
305 crack (>= 0.1.7) 307 crack (>= 0.1.7)
306 xpath (0.1.4) 308 xpath (0.1.4)
307 nokogiri (~> 1.3) 309 nokogiri (~> 1.3)
@@ -323,7 +325,7 @@ DEPENDENCIES @@ -323,7 +325,7 @@ DEPENDENCIES
323 coffee-rails (= 3.2.2) 325 coffee-rails (= 3.2.2)
324 colored 326 colored
325 database_cleaner 327 database_cleaner
326 - devise 328 + devise (~> 1.5)
327 drapper 329 drapper
328 faker 330 faker
329 foreman 331 foreman