Download as
Browse Code »

Commit 106764ab3b42f9d81a6ad81f2611ea1d78d7ae05

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

update gems. remove console.log

Showing 3 changed files with 65 additions and 65 deletions   Show diff stats
Gemfile
  Diff comments   View file @106764a
... ... @@ -76,7 +76,7 @@ gem "github-markup", "~> 0.7.4", require: 'github/markup'
76 76 gem "asciidoctor"
77 77  
78 78 # Servers
79   -gem "puma", '~> 2.0.1'
  79 +gem "puma", '~> 2.1.1'
80 80  
81 81 # State machine
82 82 gem "state_machine"
... ... @@ -168,7 +168,7 @@ group :development, :test do
168 168 gem 'factory_girl_rails'
169 169  
170 170 # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
171   - gem 'minitest'
  171 + gem 'minitest', '~> 4.7.0'
172 172  
173 173 # Generate Fake data
174 174 gem "ffaker"
... ...
Gemfile.lock
  Diff comments   View file @106764a
1 1 GIT
2 2 remote: https://github.com/ctran/annotate_models.git
3   - revision: 8bd159c7a484093fde84beaa9e6398f25ddacf09
  3 + revision: 18a4e2eb77c8f3ef695b563e4a7ca45dfede819b
4 4 specs:
5   - annotate (2.6.0.beta1)
  5 + annotate (2.6.0.beta2)
6 6 activerecord (>= 2.3.0)
7 7 rake (>= 0.8.7)
8 8  
... ... @@ -42,20 +42,20 @@ GEM
42 42 activesupport (3.2.13)
43 43 i18n (= 0.6.1)
44 44 multi_json (~> 1.0)
45   - acts-as-taggable-on (2.4.0)
46   - rails (~> 3.0)
  45 + acts-as-taggable-on (2.4.1)
  46 + rails (>= 3, < 5)
47 47 addressable (2.3.4)
48 48 arel (3.0.2)
49 49 asciidoctor (0.1.3)
50 50 awesome_print (1.1.0)
51   - backports (2.6.7)
  51 + backports (3.3.2)
52 52 bcrypt-ruby (3.0.1)
53   - better_errors (0.8.0)
  53 + better_errors (0.9.0)
54 54 coderay (>= 1.0.0)
55 55 erubis (>= 2.6.6)
56   - binding_of_caller (0.7.1)
  56 + binding_of_caller (0.7.2)
57 57 debug_inspector (>= 0.0.1)
58   - bootstrap-sass (2.3.1.0)
  58 + bootstrap-sass (2.3.2.0)
59 59 sass (~> 3.2)
60 60 builder (3.0.4)
61 61 capybara (2.1.0)
... ... @@ -67,7 +67,7 @@ GEM
67 67 carrierwave (0.8.0)
68 68 activemodel (>= 3.2.0)
69 69 activesupport (>= 3.2.0)
70   - celluloid (0.14.0)
  70 + celluloid (0.14.1)
71 71 timers (>= 1.0.0)
72 72 charlock_holmes (0.6.9.4)
73 73 childprocess (0.3.9)
... ... @@ -75,7 +75,7 @@ GEM
75 75 chosen-rails (0.9.8)
76 76 railties (~> 3.0)
77 77 thor (~> 0.14)
78   - code_analyzer (0.3.1)
  78 + code_analyzer (0.3.2)
79 79 sexp_processor
80 80 coderay (1.0.9)
81 81 coffee-rails (3.2.2)
... ... @@ -87,15 +87,16 @@ GEM
87 87 coffee-script-source (1.6.2)
88 88 colored (1.2)
89 89 colorize (0.5.8)
90   - connection_pool (1.0.0)
  90 + connection_pool (1.1.0)
91 91 coveralls (0.6.7)
92 92 colorize
93 93 multi_json (~> 1.3)
94 94 rest-client
95 95 simplecov (>= 0.7)
96 96 thor
97   - crack (0.3.2)
98   - d3_rails (3.1.4)
  97 + crack (0.4.0)
  98 + safe_yaml (~> 0.9.0)
  99 + d3_rails (3.1.10)
99 100 railties (>= 3.1.0)
100 101 daemons (1.1.9)
101 102 database_cleaner (1.0.1)
... ... @@ -107,11 +108,11 @@ GEM
107 108 railties (~> 3.1)
108 109 warden (~> 1.2.1)
109 110 diff-lcs (1.2.4)
110   - dotenv (0.7.0)
  111 + dotenv (0.8.0)
111 112 email_spec (1.4.0)
112 113 launchy (~> 2.1)
113 114 mail (~> 2.2)
114   - enumerize (0.5.1)
  115 + enumerize (0.6.1)
115 116 activesupport (>= 3.2)
116 117 erubis (2.7.0)
117 118 escape_utils (0.2.4)
... ... @@ -129,8 +130,8 @@ GEM
129 130 faraday (>= 0.7.4, < 0.9)
130 131 faye-websocket (0.4.7)
131 132 eventmachine (>= 0.12.0)
132   - ffaker (1.16.0)
133   - ffi (1.8.1)
  133 + ffaker (1.16.1)
  134 + ffi (1.9.0)
134 135 font-awesome-rails (3.1.1.3)
135 136 railties (>= 3.2, < 5.0)
136 137 foreman (0.63.0)
... ... @@ -174,7 +175,7 @@ GEM
174 175 omniauth (~> 1.0)
175 176 pyu-ruby-sasl (~> 0.0.3.1)
176 177 rubyntlm (~> 0.1.1)
177   - gon (4.1.0)
  178 + gon (4.1.1)
178 179 actionpack (>= 2.3.0)
179 180 json
180 181 grape (0.4.1)
... ... @@ -191,19 +192,19 @@ GEM
191 192 activesupport
192 193 multi_json (>= 1.3.2)
193 194 growl (1.0.3)
194   - guard (1.8.0)
  195 + guard (1.8.1)
195 196 formatador (>= 0.2.4)
196 197 listen (>= 1.0.0)
197 198 lumberjack (>= 1.0.2)
198 199 pry (>= 0.9.10)
199 200 thor (>= 0.14.6)
200   - guard-rspec (3.0.0)
  201 + guard-rspec (3.0.2)
201 202 guard (>= 1.8)
202 203 rspec (~> 2.13)
203 204 guard-spinach (0.0.2)
204 205 guard (>= 1.1)
205 206 spinach
206   - haml (4.0.2)
  207 + haml (4.0.3)
207 208 tilt
208 209 haml-rails (0.4)
209 210 actionpack (>= 3.1, < 4.1)
... ... @@ -211,9 +212,10 @@ GEM
211 212 haml (>= 3.1, < 4.1)
212 213 railties (>= 3.1, < 4.1)
213 214 hashie (1.2.0)
214   - hike (1.2.2)
  215 + hike (1.2.3)
215 216 hipchat (0.9.0)
216 217 httparty
  218 + httparty
217 219 http_parser.rb (0.5.3)
218 220 httparty (0.11.0)
219 221 multi_json (~> 1.0)
... ... @@ -243,18 +245,17 @@ GEM
243 245 kaminari (0.14.1)
244 246 actionpack (>= 3.0.0)
245 247 activesupport (>= 3.0.0)
246   - launchy (2.2.0)
  248 + launchy (2.3.0)
247 249 addressable (~> 2.3)
248   - letter_opener (1.1.0)
249   - launchy (~> 2.2.0)
  250 + letter_opener (1.1.1)
  251 + launchy (~> 2.2)
250 252 libv8 (3.11.8.17)
251   - listen (1.1.3)
  253 + listen (1.2.2)
252 254 rb-fsevent (>= 0.9.3)
253 255 rb-inotify (>= 0.9)
254 256 rb-kqueue (>= 0.2)
255 257 lumberjack (1.0.3)
256   - mail (2.5.3)
257   - i18n (>= 0.4.0)
  258 + mail (2.5.4)
258 259 mime-types (~> 1.16)
259 260 treetop (~> 1.4.8)
260 261 method_source (0.8.1)
... ... @@ -262,12 +263,12 @@ GEM
262 263 minitest (4.7.4)
263 264 modernizr (2.6.2)
264 265 sprockets (~> 2.0)
265   - multi_json (1.7.3)
266   - multi_xml (0.5.3)
  266 + multi_json (1.7.7)
  267 + multi_xml (0.5.4)
267 268 multipart-post (1.2.0)
268 269 mysql2 (0.3.11)
269 270 net-ldap (0.3.1)
270   - nokogiri (1.5.9)
  271 + nokogiri (1.5.10)
271 272 oauth (0.4.7)
272 273 oauth2 (0.8.1)
273 274 faraday (~> 0.8)
... ... @@ -281,7 +282,7 @@ GEM
281 282 omniauth-github (1.1.0)
282 283 omniauth (~> 1.0)
283 284 omniauth-oauth2 (~> 1.1)
284   - omniauth-google-oauth2 (0.1.17)
  285 + omniauth-google-oauth2 (0.1.19)
285 286 omniauth (~> 1.0)
286 287 omniauth-oauth2
287 288 omniauth-oauth (1.0.1)
... ... @@ -290,7 +291,7 @@ GEM
290 291 omniauth-oauth2 (1.1.1)
291 292 oauth2 (~> 0.8.0)
292 293 omniauth (~> 1.0)
293   - omniauth-twitter (0.0.16)
  294 + omniauth-twitter (0.0.17)
294 295 multi_json (~> 1.3)
295 296 omniauth-oauth (~> 1.0)
296 297 orm_adapter (0.4.0)
... ... @@ -305,7 +306,7 @@ GEM
305 306 coderay (~> 1.0.5)
306 307 method_source (~> 0.8)
307 308 slop (~> 3.4)
308   - puma (2.0.1)
  309 + puma (2.1.1)
309 310 rack (>= 1.1, < 2.0)
310 311 pygments.rb (0.4.2)
311 312 posix-spawn (~> 0.3.6)
... ... @@ -339,7 +340,7 @@ GEM
339 340 rails-dev-tweaks (0.6.1)
340 341 actionpack (~> 3.1)
341 342 railties (~> 3.1)
342   - rails_best_practices (1.13.4)
  343 + rails_best_practices (1.13.8)
343 344 activesupport
344 345 awesome_print
345 346 code_analyzer
... ... @@ -354,7 +355,7 @@ GEM
354 355 rake (>= 0.8.7)
355 356 rdoc (~> 3.4)
356 357 thor (>= 0.14.6, < 2.0)
357   - rake (10.0.4)
  358 + rake (10.1.0)
358 359 rb-fsevent (0.9.3)
359 360 rb-inotify (0.9.0)
360 361 ffi (>= 0.5.0)
... ... @@ -382,7 +383,7 @@ GEM
382 383 redis-store (~> 1.1.0)
383 384 redis-store (1.1.3)
384 385 redis (>= 2.2.0)
385   - ref (1.0.4)
  386 + ref (1.0.5)
386 387 rest-client (1.6.7)
387 388 mime-types (>= 1.16)
388 389 rspec (2.13.0)
... ... @@ -393,16 +394,17 @@ GEM
393 394 rspec-expectations (2.13.0)
394 395 diff-lcs (>= 1.1.3, < 2.0)
395 396 rspec-mocks (2.13.1)
396   - rspec-rails (2.13.1)
  397 + rspec-rails (2.13.2)
397 398 actionpack (>= 3.0)
398 399 activesupport (>= 3.0)
399 400 railties (>= 3.0)
400 401 rspec-core (~> 2.13.0)
401 402 rspec-expectations (~> 2.13.0)
402 403 rspec-mocks (~> 2.13.0)
403   - ruby-progressbar (1.0.2)
  404 + ruby-progressbar (1.1.1)
404 405 rubyntlm (0.1.1)
405 406 rubyzip (0.9.9)
  407 + safe_yaml (0.9.3)
406 408 sanitize (2.0.3)
407 409 nokogiri (>= 1.4.4, < 1.6)
408 410 sass (3.2.9)
... ... @@ -416,10 +418,10 @@ GEM
416 418 seed-fu (2.2.0)
417 419 activerecord (~> 3.1)
418 420 activesupport (~> 3.1)
419   - select2-rails (3.3.1)
420   - sass-rails (>= 3.2)
  421 + select2-rails (3.4.2)
  422 + sass-rails
421 423 thor (~> 0.14)
422   - selenium-webdriver (2.32.1)
  424 + selenium-webdriver (2.33.0)
423 425 childprocess (>= 0.2.5)
424 426 multi_json (~> 1.0)
425 427 rubyzip
... ... @@ -428,8 +430,8 @@ GEM
428 430 sexp_processor (4.2.1)
429 431 shoulda-matchers (2.1.0)
430 432 activesupport (>= 3.0.0)
431   - sidekiq (2.12.0)
432   - celluloid (>= 0.14.0)
  433 + sidekiq (2.12.4)
  434 + celluloid (>= 0.14.1)
433 435 connection_pool (>= 1.0.0)
434 436 json
435 437 redis (>= 3.0)
... ... @@ -439,23 +441,23 @@ GEM
439 441 multi_json (~> 1.0)
440 442 simplecov-html (~> 0.7.1)
441 443 simplecov-html (0.7.1)
442   - sinatra (1.3.6)
  444 + sinatra (1.4.3)
443 445 rack (~> 1.4)
444   - rack-protection (~> 1.3)
445   - tilt (~> 1.3, >= 1.3.3)
  446 + rack-protection (~> 1.4)
  447 + tilt (~> 1.3, >= 1.3.4)
446 448 six (0.2.0)
447   - slim (1.3.8)
448   - temple (~> 0.6.3)
449   - tilt (~> 1.3.3)
  449 + slim (2.0.0)
  450 + temple (~> 0.6.5)
  451 + tilt (~> 1.3, >= 1.3.3)
450 452 slop (3.4.5)
451   - spinach (0.8.2)
  453 + spinach (0.8.3)
452 454 colorize (= 0.5.8)
453 455 gherkin-ruby (~> 0.3.0)
454 456 spinach-rails (0.2.1)
455 457 capybara (>= 2.0.0)
456 458 railties (>= 3)
457 459 spinach (>= 0.4)
458   - spork (1.0.0rc3)
  460 + spork (1.0.0rc2)
459 461 sprockets (2.2.2)
460 462 hike (~> 1.2)
461 463 multi_json (~> 1.0)
... ... @@ -464,7 +466,7 @@ GEM
464 466 stamp (0.5.0)
465 467 state_machine (1.2.0)
466 468 stringex (1.5.1)
467   - temple (0.6.4)
  469 + temple (0.6.5)
468 470 test_after_commit (0.2.0)
469 471 therubyracer (0.11.4)
470 472 libv8 (~> 3.11.8.12)
... ... @@ -474,7 +476,7 @@ GEM
474 476 eventmachine (>= 0.12.6)
475 477 rack (>= 1.0.0)
476 478 thor (0.18.1)
477   - tilt (1.3.7)
  479 + tilt (1.4.1)
478 480 timers (1.1.0)
479 481 tinder (1.9.2)
480 482 eventmachine (~> 1.0)
... ... @@ -485,22 +487,22 @@ GEM
485 487 mime-types (~> 1.19)
486 488 multi_json (~> 1.5)
487 489 twitter-stream (~> 0.1)
488   - treetop (1.4.12)
  490 + treetop (1.4.14)
489 491 polyglot
490 492 polyglot (>= 0.3.1)
491   - turbolinks (1.1.1)
  493 + turbolinks (1.2.0)
492 494 coffee-rails
493 495 twitter-stream (0.1.16)
494 496 eventmachine (>= 0.12.8)
495 497 http_parser.rb (~> 0.5.1)
496 498 simple_oauth (~> 0.1.4)
497 499 tzinfo (0.3.37)
498   - uglifier (2.0.1)
  500 + uglifier (2.1.1)
499 501 execjs (>= 0.3.0)
500 502 multi_json (~> 1.0, >= 1.0.2)
501 503 underscore-rails (1.4.4)
502   - virtus (0.5.4)
503   - backports (~> 2.6.1)
  504 + virtus (0.5.5)
  505 + backports (~> 3.3)
504 506 descendants_tracker (~> 0.0.1)
505 507 warden (1.2.1)
506 508 rack (>= 1.0)
... ... @@ -564,7 +566,7 @@ DEPENDENCIES
564 566 kaminari (~> 0.14.1)
565 567 launchy
566 568 letter_opener
567   - minitest
  569 + minitest (~> 4.7.0)
568 570 modernizr (= 2.6.2)
569 571 mysql2
570 572 omniauth (~> 1.1.3)
... ... @@ -574,7 +576,7 @@ DEPENDENCIES
574 576 pg
575 577 poltergeist (~> 1.3.0)
576 578 pry
577   - puma (~> 2.0.1)
  579 + puma (~> 2.1.1)
578 580 quiet_assets (~> 1.0.1)
579 581 rack-mini-profiler
580 582 rails (= 3.2.13)
... ...
app/assets/javascripts/dispatcher.js.coffee
  Diff comments   View file @106764a
... ... @@ -10,8 +10,6 @@ class Dispatcher
10 10 page = $('body').attr('data-page')
11 11 project_id = $('body').attr('data-project-id')
12 12  
13   - console.log(page)
14   -
15 13 unless page
16 14 return false
17 15  
... ...