Download as
Browse Code »

Commit 083d66563e8275fd13851ec0a1974cb17379f84f

Authored by Dmitriy Zaporozhets
1 parent 23ee8e62
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Update all gems!

Showing 4 changed files with 101 additions and 92 deletions   Show diff stats
@@ -36,11 +36,11 @@ gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap" @@ -36,11 +36,11 @@ gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap"
36 gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb' 36 gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb'
37 37
38 # Language detection 38 # Language detection
39 -gem "github-linguist", "~> 2.3.4" , require: "linguist" 39 +gem "github-linguist", require: "linguist"
40 40
41 # API 41 # API
42 -gem "grape", "~> 0.3.1"  
43 -gem "grape-entity", "~> 0.2.0" 42 +gem "grape"
  43 +gem "grape-entity"
44 44
45 # Format dates and times 45 # Format dates and times
46 # based on human-friendly examples 46 # based on human-friendly examples
@@ -71,13 +71,13 @@ gem "redcarpet", "~> 2.2.2" @@ -71,13 +71,13 @@ gem "redcarpet", "~> 2.2.2"
71 gem "github-markup", "~> 0.7.4", require: 'github/markup' 71 gem "github-markup", "~> 0.7.4", require: 'github/markup'
72 72
73 # Servers 73 # Servers
74 -gem "puma", '~> 2.0.0.b7' 74 +gem "puma", '~> 2.0.1'
75 75
76 # State machine 76 # State machine
77 gem "state_machine" 77 gem "state_machine"
78 78
79 # Issue tags 79 # Issue tags
80 -gem "acts-as-taggable-on", "2.3.3" 80 +gem "acts-as-taggable-on"
81 81
82 # Background jobs 82 # Background jobs
83 gem 'slim' 83 gem 'slim'
@@ -103,9 +103,9 @@ gem "foreman" @@ -103,9 +103,9 @@ gem "foreman"
103 gem "redis-rails" 103 gem "redis-rails"
104 104
105 group :assets do 105 group :assets do
106 - gem "sass-rails", "~> 3.2.5"  
107 - gem "coffee-rails", "~> 3.2.2"  
108 - gem "uglifier", "~> 1.3.0" 106 + gem "sass-rails"
  107 + gem "coffee-rails"
  108 + gem "uglifier"
109 gem "therubyracer" 109 gem "therubyracer"
110 gem 'turbolinks' 110 gem 'turbolinks'
111 gem 'jquery-turbolinks' 111 gem 'jquery-turbolinks'
1 GIT 1 GIT
2 remote: https://github.com/ctran/annotate_models.git 2 remote: https://github.com/ctran/annotate_models.git
3 - revision: be4e26825b521f0b2d86b181e2dff89901aa9b1e 3 + revision: 8bd159c7a484093fde84beaa9e6398f25ddacf09
4 specs: 4 specs:
5 annotate (2.6.0.beta1) 5 annotate (2.6.0.beta1)
6 activerecord (>= 2.3.0) 6 activerecord (>= 2.3.0)
@@ -62,16 +62,16 @@ GEM @@ -62,16 +62,16 @@ GEM
62 activesupport (3.2.13) 62 activesupport (3.2.13)
63 i18n (= 0.6.1) 63 i18n (= 0.6.1)
64 multi_json (~> 1.0) 64 multi_json (~> 1.0)
65 - acts-as-taggable-on (2.3.3) 65 + acts-as-taggable-on (2.4.0)
66 rails (~> 3.0) 66 rails (~> 3.0)
67 - addressable (2.3.2) 67 + addressable (2.3.4)
68 arel (3.0.2) 68 arel (3.0.2)
69 awesome_print (1.1.0) 69 awesome_print (1.1.0)
70 backports (2.6.7) 70 backports (2.6.7)
71 bcrypt-ruby (3.0.1) 71 bcrypt-ruby (3.0.1)
72 - better_errors (0.3.2) 72 + better_errors (0.8.0)
73 coderay (>= 1.0.0) 73 coderay (>= 1.0.0)
74 - erubis (>= 2.7.0) 74 + erubis (>= 2.6.6)
75 binding_of_caller (0.7.1) 75 binding_of_caller (0.7.1)
76 debug_inspector (>= 0.0.1) 76 debug_inspector (>= 0.0.1)
77 bootstrap-sass (2.2.1.1) 77 bootstrap-sass (2.2.1.1)
@@ -86,10 +86,9 @@ GEM @@ -86,10 +86,9 @@ GEM
86 carrierwave (0.8.0) 86 carrierwave (0.8.0)
87 activemodel (>= 3.2.0) 87 activemodel (>= 3.2.0)
88 activesupport (>= 3.2.0) 88 activesupport (>= 3.2.0)
89 - celluloid (0.12.4)  
90 - facter (>= 1.6.12) 89 + celluloid (0.13.0)
91 timers (>= 1.0.0) 90 timers (>= 1.0.0)
92 - charlock_holmes (0.6.9) 91 + charlock_holmes (0.6.9.4)
93 chosen-rails (0.9.8) 92 chosen-rails (0.9.8)
94 railties (~> 3.0) 93 railties (~> 3.0)
95 thor (~> 0.14) 94 thor (~> 0.14)
@@ -102,11 +101,11 @@ GEM @@ -102,11 +101,11 @@ GEM
102 coffee-script (2.2.0) 101 coffee-script (2.2.0)
103 coffee-script-source 102 coffee-script-source
104 execjs 103 execjs
105 - coffee-script-source (1.4.0) 104 + coffee-script-source (1.6.2)
106 colored (1.2) 105 colored (1.2)
107 colorize (0.5.8) 106 colorize (0.5.8)
108 connection_pool (1.0.0) 107 connection_pool (1.0.0)
109 - coveralls (0.6.2) 108 + coveralls (0.6.7)
110 colorize 109 colorize
111 multi_json (~> 1.3) 110 multi_json (~> 1.3)
112 rest-client 111 rest-client
@@ -122,7 +121,8 @@ GEM @@ -122,7 +121,8 @@ GEM
122 orm_adapter (~> 0.1) 121 orm_adapter (~> 0.1)
123 railties (~> 3.1) 122 railties (~> 3.1)
124 warden (~> 1.2.1) 123 warden (~> 1.2.1)
125 - diff-lcs (1.2.1) 124 + diff-lcs (1.2.4)
  125 + dotenv (0.7.0)
126 email_spec (1.4.0) 126 email_spec (1.4.0)
127 launchy (~> 2.1) 127 launchy (~> 2.1)
128 mail (~> 2.2) 128 mail (~> 2.2)
@@ -130,28 +130,29 @@ GEM @@ -130,28 +130,29 @@ GEM
130 activesupport (>= 3.2) 130 activesupport (>= 3.2)
131 erubis (2.7.0) 131 erubis (2.7.0)
132 escape_utils (0.2.4) 132 escape_utils (0.2.4)
133 - eventmachine (1.0.0) 133 + eventmachine (1.0.3)
134 execjs (1.4.0) 134 execjs (1.4.0)
135 multi_json (~> 1.0) 135 multi_json (~> 1.0)
136 - facter (1.6.18)  
137 - factory_girl (4.1.0) 136 + factory_girl (4.2.0)
138 activesupport (>= 3.0.0) 137 activesupport (>= 3.0.0)
139 - factory_girl_rails (4.1.0)  
140 - factory_girl (~> 4.1.0) 138 + factory_girl_rails (4.2.1)
  139 + factory_girl (~> 4.2.0)
141 railties (>= 3.0.0) 140 railties (>= 3.0.0)
142 - faraday (0.8.6) 141 + faraday (0.8.7)
143 multipart-post (~> 1.1) 142 multipart-post (~> 1.1)
144 faye-websocket (0.4.7) 143 faye-websocket (0.4.7)
145 eventmachine (>= 0.12.0) 144 eventmachine (>= 0.12.0)
146 - ffaker (1.15.0)  
147 - ffi (1.6.0) 145 + ffaker (1.16.0)
  146 + ffi (1.8.1)
148 font-awesome-sass-rails (3.0.2.2) 147 font-awesome-sass-rails (3.0.2.2)
149 railties (>= 3.1.1) 148 railties (>= 3.1.1)
150 sass-rails (>= 3.1.1) 149 sass-rails (>= 3.1.1)
151 - foreman (0.62.0) 150 + foreman (0.63.0)
  151 + dotenv (>= 0.7)
152 thor (>= 0.13.6) 152 thor (>= 0.13.6)
  153 + formatador (0.2.4)
153 gemoji (1.2.1) 154 gemoji (1.2.1)
154 - gherkin-ruby (0.2.1) 155 + gherkin-ruby (0.3.0)
155 github-linguist (2.3.4) 156 github-linguist (2.3.4)
156 charlock_holmes (~> 0.6.6) 157 charlock_holmes (~> 0.6.6)
157 escape_utils (~> 0.2.3) 158 escape_utils (~> 0.2.3)
@@ -183,46 +184,48 @@ GEM @@ -183,46 +184,48 @@ GEM
183 pygments.rb (~> 0.4.2) 184 pygments.rb (~> 0.4.2)
184 sanitize (~> 2.0.3) 185 sanitize (~> 2.0.3)
185 stringex (~> 1.5.1) 186 stringex (~> 1.5.1)
186 - gon (4.0.2)  
187 - grape (0.3.2) 187 + gon (4.1.0)
  188 + actionpack (>= 2.3.0)
  189 + json
  190 + grape (0.4.1)
188 activesupport 191 activesupport
189 builder 192 builder
190 hashie (>= 1.2.0) 193 hashie (>= 1.2.0)
191 multi_json (>= 1.3.2) 194 multi_json (>= 1.3.2)
192 multi_xml (>= 0.5.2) 195 multi_xml (>= 0.5.2)
193 - rack 196 + rack (>= 1.3.0)
194 rack-accept 197 rack-accept
195 rack-mount 198 rack-mount
196 virtus 199 virtus
197 - grape-entity (0.2.0) 200 + grape-entity (0.3.0)
198 activesupport 201 activesupport
199 multi_json (>= 1.3.2) 202 multi_json (>= 1.3.2)
200 grit_ext (0.8.1) 203 grit_ext (0.8.1)
201 charlock_holmes (~> 0.6.9) 204 charlock_holmes (~> 0.6.9)
202 growl (1.0.3) 205 growl (1.0.3)
203 - guard (1.6.2)  
204 - listen (>= 0.6.0) 206 + guard (1.8.0)
  207 + formatador (>= 0.2.4)
  208 + listen (>= 1.0.0)
205 lumberjack (>= 1.0.2) 209 lumberjack (>= 1.0.2)
206 pry (>= 0.9.10) 210 pry (>= 0.9.10)
207 - terminal-table (>= 1.4.3)  
208 thor (>= 0.14.6) 211 thor (>= 0.14.6)
209 - guard-rspec (2.5.1)  
210 - guard (>= 1.1)  
211 - rspec (~> 2.11) 212 + guard-rspec (2.6.0)
  213 + guard (>= 1.8)
  214 + rspec (~> 2.13)
212 guard-spinach (0.0.2) 215 guard-spinach (0.0.2)
213 guard (>= 1.1) 216 guard (>= 1.1)
214 spinach 217 spinach
215 - haml (4.0.0) 218 + haml (4.0.2)
216 tilt 219 tilt
217 haml-rails (0.4) 220 haml-rails (0.4)
218 actionpack (>= 3.1, < 4.1) 221 actionpack (>= 3.1, < 4.1)
219 activesupport (>= 3.1, < 4.1) 222 activesupport (>= 3.1, < 4.1)
220 haml (>= 3.1, < 4.1) 223 haml (>= 3.1, < 4.1)
221 railties (>= 3.1, < 4.1) 224 railties (>= 3.1, < 4.1)
222 - hashie (1.2.0) 225 + hashie (2.0.4)
223 hike (1.2.2) 226 hike (1.2.2)
224 http_parser.rb (0.5.3) 227 http_parser.rb (0.5.3)
225 - httparty (0.10.2) 228 + httparty (0.11.0)
226 multi_json (~> 1.0) 229 multi_json (~> 1.0)
227 multi_xml (>= 0.5.2) 230 multi_xml (>= 0.5.2)
228 httpauth (0.2.0) 231 httpauth (0.2.0)
@@ -239,29 +242,32 @@ GEM @@ -239,29 +242,32 @@ GEM
239 jquery-rails 242 jquery-rails
240 railties (>= 3.1.0) 243 railties (>= 3.1.0)
241 json (1.7.7) 244 json (1.7.7)
242 - jwt (0.1.5)  
243 - multi_json (>= 1.0) 245 + jwt (0.1.8)
  246 + multi_json (>= 1.5)
244 kaminari (0.14.1) 247 kaminari (0.14.1)
245 actionpack (>= 3.0.0) 248 actionpack (>= 3.0.0)
246 activesupport (>= 3.0.0) 249 activesupport (>= 3.0.0)
247 - launchy (2.1.2) 250 + launchy (2.2.0)
248 addressable (~> 2.3) 251 addressable (~> 2.3)
249 - letter_opener (1.0.0)  
250 - launchy (>= 2.0.4) 252 + letter_opener (1.1.0)
  253 + launchy (~> 2.2.0)
251 libv8 (3.11.8.17) 254 libv8 (3.11.8.17)
252 - listen (0.7.3) 255 + listen (1.0.3)
  256 + rb-fsevent (>= 0.9.3)
  257 + rb-inotify (>= 0.9)
  258 + rb-kqueue (>= 0.2)
253 lumberjack (1.0.3) 259 lumberjack (1.0.3)
254 mail (2.5.3) 260 mail (2.5.3)
255 i18n (>= 0.4.0) 261 i18n (>= 0.4.0)
256 mime-types (~> 1.16) 262 mime-types (~> 1.16)
257 treetop (~> 1.4.8) 263 treetop (~> 1.4.8)
258 method_source (0.8.1) 264 method_source (0.8.1)
259 - mime-types (1.22) 265 + mime-types (1.23)
260 modernizr (2.6.2) 266 modernizr (2.6.2)
261 sprockets (~> 2.0) 267 sprockets (~> 2.0)
262 multi_json (1.7.2) 268 multi_json (1.7.2)
263 multi_xml (0.5.3) 269 multi_xml (0.5.3)
264 - multipart-post (1.1.5) 270 + multipart-post (1.2.0)
265 mysql2 (0.3.11) 271 mysql2 (0.3.11)
266 net-ldap (0.2.2) 272 net-ldap (0.2.2)
267 nokogiri (1.5.9) 273 nokogiri (1.5.9)
@@ -272,13 +278,13 @@ GEM @@ -272,13 +278,13 @@ GEM
272 jwt (~> 0.1.4) 278 jwt (~> 0.1.4)
273 multi_json (~> 1.0) 279 multi_json (~> 1.0)
274 rack (~> 1.2) 280 rack (~> 1.2)
275 - omniauth (1.1.3)  
276 - hashie (~> 1.2) 281 + omniauth (1.1.4)
  282 + hashie (>= 1.2, < 3)
277 rack 283 rack
278 omniauth-github (1.1.0) 284 omniauth-github (1.1.0)
279 omniauth (~> 1.0) 285 omniauth (~> 1.0)
280 omniauth-oauth2 (~> 1.1) 286 omniauth-oauth2 (~> 1.1)
281 - omniauth-google-oauth2 (0.1.13) 287 + omniauth-google-oauth2 (0.1.17)
282 omniauth (~> 1.0) 288 omniauth (~> 1.0)
283 omniauth-oauth2 289 omniauth-oauth2
284 omniauth-oauth (1.0.1) 290 omniauth-oauth (1.0.1)
@@ -287,31 +293,31 @@ GEM @@ -287,31 +293,31 @@ GEM
287 omniauth-oauth2 (1.1.1) 293 omniauth-oauth2 (1.1.1)
288 oauth2 (~> 0.8.0) 294 oauth2 (~> 0.8.0)
289 omniauth (~> 1.0) 295 omniauth (~> 1.0)
290 - omniauth-twitter (0.0.14) 296 + omniauth-twitter (0.0.16)
291 multi_json (~> 1.3) 297 multi_json (~> 1.3)
292 omniauth-oauth (~> 1.0) 298 omniauth-oauth (~> 1.0)
293 orm_adapter (0.4.0) 299 orm_adapter (0.4.0)
294 - pg (0.14.1) 300 + pg (0.15.1)
295 polyglot (0.3.3) 301 polyglot (0.3.3)
296 posix-spawn (0.3.6) 302 posix-spawn (0.3.6)
297 - pry (0.9.12) 303 + pry (0.9.12.1)
298 coderay (~> 1.0.5) 304 coderay (~> 1.0.5)
299 method_source (~> 0.8) 305 method_source (~> 0.8)
300 slop (~> 3.4) 306 slop (~> 3.4)
301 - puma (2.0.0.b7) 307 + puma (2.0.1)
302 rack (>= 1.1, < 2.0) 308 rack (>= 1.1, < 2.0)
303 pygments.rb (0.4.2) 309 pygments.rb (0.4.2)
304 posix-spawn (~> 0.3.6) 310 posix-spawn (~> 0.3.6)
305 yajl-ruby (~> 1.1.0) 311 yajl-ruby (~> 1.1.0)
306 pyu-ruby-sasl (0.0.3.3) 312 pyu-ruby-sasl (0.0.3.3)
307 - quiet_assets (1.0.1)  
308 - railties (~> 3.1) 313 + quiet_assets (1.0.2)
  314 + railties (>= 3.1, < 5.0)
309 rack (1.4.5) 315 rack (1.4.5)
310 rack-accept (0.4.5) 316 rack-accept (0.4.5)
311 rack (>= 0.4) 317 rack (>= 0.4)
312 rack-cache (1.2) 318 rack-cache (1.2)
313 rack (>= 0.4) 319 rack (>= 0.4)
314 - rack-mini-profiler (0.1.23) 320 + rack-mini-profiler (0.1.26)
315 rack (>= 1.1.3) 321 rack (>= 1.1.3)
316 rack-mount (0.8.3) 322 rack-mount (0.8.3)
317 rack (>= 1.0.0) 323 rack (>= 1.0.0)
@@ -348,13 +354,15 @@ GEM @@ -348,13 +354,15 @@ GEM
348 rdoc (~> 3.4) 354 rdoc (~> 3.4)
349 thor (>= 0.14.6, < 2.0) 355 thor (>= 0.14.6, < 2.0)
350 rake (10.0.4) 356 rake (10.0.4)
351 - rb-fsevent (0.9.2)  
352 - rb-inotify (0.8.8) 357 + rb-fsevent (0.9.3)
  358 + rb-inotify (0.9.0)
  359 + ffi (>= 0.5.0)
  360 + rb-kqueue (0.2.0)
353 ffi (>= 0.5.0) 361 ffi (>= 0.5.0)
354 rdoc (3.12.2) 362 rdoc (3.12.2)
355 json (~> 1.4) 363 json (~> 1.4)
356 redcarpet (2.2.2) 364 redcarpet (2.2.2)
357 - redis (3.0.3) 365 + redis (3.0.4)
358 redis-actionpack (3.2.3) 366 redis-actionpack (3.2.3)
359 actionpack (~> 3.2.3) 367 actionpack (~> 3.2.3)
360 redis-rack (~> 1.4.0) 368 redis-rack (~> 1.4.0)
@@ -383,8 +391,8 @@ GEM @@ -383,8 +391,8 @@ GEM
383 rspec-core (2.13.1) 391 rspec-core (2.13.1)
384 rspec-expectations (2.13.0) 392 rspec-expectations (2.13.0)
385 diff-lcs (>= 1.1.3, < 2.0) 393 diff-lcs (>= 1.1.3, < 2.0)
386 - rspec-mocks (2.13.0)  
387 - rspec-rails (2.13.0) 394 + rspec-mocks (2.13.1)
  395 + rspec-rails (2.13.1)
388 actionpack (>= 3.0) 396 actionpack (>= 3.0)
389 activesupport (>= 3.0) 397 activesupport (>= 3.0)
390 railties (>= 3.0) 398 railties (>= 3.0)
@@ -395,7 +403,7 @@ GEM @@ -395,7 +403,7 @@ GEM
395 rubyntlm (0.1.1) 403 rubyntlm (0.1.1)
396 sanitize (2.0.3) 404 sanitize (2.0.3)
397 nokogiri (>= 1.4.4, < 1.6) 405 nokogiri (>= 1.4.4, < 1.6)
398 - sass (3.2.7) 406 + sass (3.2.8)
399 sass-rails (3.2.6) 407 sass-rails (3.2.6)
400 railties (~> 3.2.0) 408 railties (~> 3.2.0)
401 sass (>= 3.1.10) 409 sass (>= 3.1.10)
@@ -410,11 +418,11 @@ GEM @@ -410,11 +418,11 @@ GEM
410 sass-rails (>= 3.2) 418 sass-rails (>= 3.2)
411 thor (~> 0.14) 419 thor (~> 0.14)
412 settingslogic (2.0.9) 420 settingslogic (2.0.9)
413 - sexp_processor (4.2.0) 421 + sexp_processor (4.2.1)
414 shoulda-matchers (1.3.0) 422 shoulda-matchers (1.3.0)
415 activesupport (>= 3.0.0) 423 activesupport (>= 3.0.0)
416 - sidekiq (2.9.0)  
417 - celluloid (~> 0.12.0) 424 + sidekiq (2.11.1)
  425 + celluloid (~> 0.13.0)
418 connection_pool (~> 1.0) 426 connection_pool (~> 1.0)
419 multi_json (~> 1) 427 multi_json (~> 1)
420 redis (~> 3) 428 redis (~> 3)
@@ -428,15 +436,15 @@ GEM @@ -428,15 +436,15 @@ GEM
428 rack-protection (~> 1.3) 436 rack-protection (~> 1.3)
429 tilt (~> 1.3, >= 1.3.3) 437 tilt (~> 1.3, >= 1.3.3)
430 six (0.2.0) 438 six (0.2.0)
431 - slim (1.3.6)  
432 - temple (~> 0.5.5) 439 + slim (1.3.8)
  440 + temple (~> 0.6.3)
433 tilt (~> 1.3.3) 441 tilt (~> 1.3.3)
434 slop (3.4.4) 442 slop (3.4.4)
435 - spinach (0.8.1) 443 + spinach (0.8.2)
436 colorize (= 0.5.8) 444 colorize (= 0.5.8)
437 - gherkin-ruby (~> 0.2.1)  
438 - spinach-rails (0.1.7)  
439 - capybara (>= 1.0) 445 + gherkin-ruby (~> 0.3.0)
  446 + spinach-rails (0.2.1)
  447 + capybara (>= 2.0.0)
440 railties (>= 3) 448 railties (>= 3)
441 spinach (>= 0.4) 449 spinach (>= 0.4)
442 spork (1.0.0rc3) 450 spork (1.0.0rc3)
@@ -446,15 +454,14 @@ GEM @@ -446,15 +454,14 @@ GEM
446 rack (~> 1.0) 454 rack (~> 1.0)
447 tilt (~> 1.1, != 1.3.0) 455 tilt (~> 1.1, != 1.3.0)
448 stamp (0.5.0) 456 stamp (0.5.0)
449 - state_machine (1.1.2) 457 + state_machine (1.2.0)
450 stringex (1.5.1) 458 stringex (1.5.1)
451 - temple (0.5.5)  
452 - terminal-table (1.4.5)  
453 - test_after_commit (0.0.1) 459 + temple (0.6.4)
  460 + test_after_commit (0.2.0)
454 therubyracer (0.11.4) 461 therubyracer (0.11.4)
455 libv8 (~> 3.11.8.12) 462 libv8 (~> 3.11.8.12)
456 ref 463 ref
457 - thin (1.5.0) 464 + thin (1.5.1)
458 daemons (>= 1.0.9) 465 daemons (>= 1.0.9)
459 eventmachine (>= 0.12.6) 466 eventmachine (>= 0.12.6)
460 rack (>= 1.0.0) 467 rack (>= 1.0.0)
@@ -467,7 +474,7 @@ GEM @@ -467,7 +474,7 @@ GEM
467 turbolinks (1.1.1) 474 turbolinks (1.1.1)
468 coffee-rails 475 coffee-rails
469 tzinfo (0.3.37) 476 tzinfo (0.3.37)
470 - uglifier (1.3.0) 477 + uglifier (2.0.1)
471 execjs (>= 0.3.0) 478 execjs (>= 0.3.0)
472 multi_json (~> 1.0, >= 1.0.2) 479 multi_json (~> 1.0, >= 1.0.2)
473 virtus (0.5.4) 480 virtus (0.5.4)
@@ -475,9 +482,9 @@ GEM @@ -475,9 +482,9 @@ GEM
475 descendants_tracker (~> 0.0.1) 482 descendants_tracker (~> 0.0.1)
476 warden (1.2.1) 483 warden (1.2.1)
477 rack (>= 1.0) 484 rack (>= 1.0)
478 - webmock (1.9.0) 485 + webmock (1.11.0)
479 addressable (>= 2.2.7) 486 addressable (>= 2.2.7)
480 - crack (>= 0.1.7) 487 + crack (>= 0.3.2)
481 xpath (2.0.0) 488 xpath (2.0.0)
482 nokogiri (~> 1.3) 489 nokogiri (~> 1.3)
483 yajl-ruby (1.1.0) 490 yajl-ruby (1.1.0)
@@ -486,7 +493,7 @@ PLATFORMS @@ -486,7 +493,7 @@ PLATFORMS
486 ruby 493 ruby
487 494
488 DEPENDENCIES 495 DEPENDENCIES
489 - acts-as-taggable-on (= 2.3.3) 496 + acts-as-taggable-on
490 annotate! 497 annotate!
491 awesome_print 498 awesome_print
492 better_errors 499 better_errors
@@ -495,7 +502,7 @@ DEPENDENCIES @@ -495,7 +502,7 @@ DEPENDENCIES
495 capybara 502 capybara
496 carrierwave 503 carrierwave
497 chosen-rails (= 0.9.8) 504 chosen-rails (= 0.9.8)
498 - coffee-rails (~> 3.2.2) 505 + coffee-rails
499 colored 506 colored
500 coveralls 507 coveralls
501 database_cleaner 508 database_cleaner
@@ -507,7 +514,7 @@ DEPENDENCIES @@ -507,7 +514,7 @@ DEPENDENCIES
507 font-awesome-sass-rails (~> 3.0.0) 514 font-awesome-sass-rails (~> 3.0.0)
508 foreman 515 foreman
509 gemoji (~> 1.2.1) 516 gemoji (~> 1.2.1)
510 - github-linguist (~> 2.3.4) 517 + github-linguist
511 github-markup (~> 0.7.4) 518 github-markup (~> 0.7.4)
512 gitlab-grack (~> 1.0.0) 519 gitlab-grack (~> 1.0.0)
513 gitlab-pygments.rb (~> 0.3.2) 520 gitlab-pygments.rb (~> 0.3.2)
@@ -516,8 +523,8 @@ DEPENDENCIES @@ -516,8 +523,8 @@ DEPENDENCIES
516 gitlab_omniauth-ldap (= 1.0.2) 523 gitlab_omniauth-ldap (= 1.0.2)
517 gollum-lib (~> 1.0.0) 524 gollum-lib (~> 1.0.0)
518 gon 525 gon
519 - grape (~> 0.3.1)  
520 - grape-entity (~> 0.2.0) 526 + grape
  527 + grape-entity
521 grit (~> 2.5.0)! 528 grit (~> 2.5.0)!
522 growl 529 growl
523 guard-rspec 530 guard-rspec
@@ -540,7 +547,7 @@ DEPENDENCIES @@ -540,7 +547,7 @@ DEPENDENCIES
540 pg 547 pg
541 poltergeist! 548 poltergeist!
542 pry 549 pry
543 - puma (~> 2.0.0.b7) 550 + puma (~> 2.0.1)
544 quiet_assets (~> 1.0.1) 551 quiet_assets (~> 1.0.1)
545 rack-mini-profiler 552 rack-mini-profiler
546 rails (= 3.2.13) 553 rails (= 3.2.13)
@@ -552,7 +559,7 @@ DEPENDENCIES @@ -552,7 +559,7 @@ DEPENDENCIES
552 redcarpet (~> 2.2.2) 559 redcarpet (~> 2.2.2)
553 redis-rails 560 redis-rails
554 rspec-rails 561 rspec-rails
555 - sass-rails (~> 3.2.5) 562 + sass-rails
556 sdoc 563 sdoc
557 seed-fu 564 seed-fu
558 select2-rails 565 select2-rails
@@ -571,5 +578,5 @@ DEPENDENCIES @@ -571,5 +578,5 @@ DEPENDENCIES
571 therubyracer 578 therubyracer
572 thin 579 thin
573 turbolinks 580 turbolinks
574 - uglifier (~> 1.3.0) 581 + uglifier
575 webmock 582 webmock
spec/observers/merge_request_observer_spec.rb
  Diff comments   View file @083d665
@@ -12,6 +12,8 @@ describe MergeRequestObserver do @@ -12,6 +12,8 @@ describe MergeRequestObserver do
12 12
13 before { subject.stub(:current_user).and_return(some_user) } 13 before { subject.stub(:current_user).and_return(some_user) }
14 before { subject.stub(notification: mock('NotificationService').as_null_object) } 14 before { subject.stub(notification: mock('NotificationService').as_null_object) }
  15 + before(:each) { enable_observers }
  16 +
15 17
16 subject { MergeRequestObserver.instance } 18 subject { MergeRequestObserver.instance }
17 19
spec/requests/api/projects_spec.rb
  Diff comments   View file @083d665
@@ -249,7 +249,7 @@ describe Gitlab::API do @@ -249,7 +249,7 @@ describe Gitlab::API do
249 response.status.should == 200 249 response.status.should == 200
250 json_response.should be_an Array 250 json_response.should be_an Array
251 json_response.count.should == 2 251 json_response.count.should == 2
252 - json_response.first['email'].should == user.email 252 + json_response.last['email'].should == user.email
253 end 253 end
254 254
255 it "finds team members with query string" do 255 it "finds team members with query string" do