Download as
Browse Code »

Commit ca0b4be0ed892f3dd78449d779bee722da95f069

Authored by Victor Costa
2 parents 0f1f87c3 cb2e88fc
Exists in staging and in 1 other branch api-homepage

Merge branch 'staging' of softwarepublico.gov.br:noosferogov/noosfero into staging

Showing 4 changed files with 56 additions and 6 deletions   Show diff stats
@@ -40,3 +40,6 @@ @@ -40,3 +40,6 @@
40 [submodule "plugins/community_hub"] 40 [submodule "plugins/community_hub"]
41 path = plugins/community_hub 41 path = plugins/community_hub
42 url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/community_hub.git 42 url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/community_hub.git
  43 +# [submodule "plugins/inclusao_digital"]
  44 +# path = plugins/inclusao_digital
  45 +# url = http://softwarepublico.gov.br/gitlab/noosfero-plugins/inclusao_digital.git
@@ -58,6 +58,9 @@ gem 'actionpack-action_caching' @@ -58,6 +58,9 @@ gem 'actionpack-action_caching'
58 gem 'activerecord-session_store' 58 gem 'activerecord-session_store'
59 gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders' 59 gem 'activerecord-deprecated_finders', require: 'active_record/deprecated_finders'
60 60
  61 +# gem for error reporting
  62 +gem 'airbrake', '~> 4'
  63 +
61 group :production do 64 group :production do
62 gem 'dalli', '~> 2.7.0' 65 gem 'dalli', '~> 2.7.0'
63 end 66 end
@@ -155,26 +155,34 @@ GEM @@ -155,26 +155,34 @@ GEM
155 acts-as-taggable-on (3.5.0) 155 acts-as-taggable-on (3.5.0)
156 activerecord (>= 3.2, < 5) 156 activerecord (>= 3.2, < 5)
157 addressable (2.4.0) 157 addressable (2.4.0)
  158 + airbrake (4.3.6)
  159 + builder
  160 + multi_json
158 ansi (1.5.0) 161 ansi (1.5.0)
159 api-pagination (4.1.1) 162 api-pagination (4.1.1)
160 arel (6.0.3) 163 arel (6.0.3)
  164 + awesome_print (1.6.1)
161 axiom-types (0.1.1) 165 axiom-types (0.1.1)
162 descendants_tracker (~> 0.0.4) 166 descendants_tracker (~> 0.0.4)
163 ice_nine (~> 0.11.0) 167 ice_nine (~> 0.11.0)
164 thread_safe (~> 0.3, >= 0.3.1) 168 thread_safe (~> 0.3, >= 0.3.1)
165 builder (3.2.2) 169 builder (3.2.2)
  170 + byebug (8.2.2)
166 capybara (2.5.0) 171 capybara (2.5.0)
167 mime-types (>= 1.16) 172 mime-types (>= 1.16)
168 nokogiri (>= 1.3.3) 173 nokogiri (>= 1.3.3)
169 rack (>= 1.0.0) 174 rack (>= 1.0.0)
170 rack-test (>= 0.5.4) 175 rack-test (>= 0.5.4)
171 xpath (~> 2.0) 176 xpath (~> 2.0)
172 - childprocess (0.5.8) 177 + childprocess (0.5.9)
173 ffi (~> 1.0, >= 1.0.11) 178 ffi (~> 1.0, >= 1.0.11)
174 chronic (0.10.2) 179 chronic (0.10.2)
  180 + coderay (1.1.0)
175 coercible (1.0.0) 181 coercible (1.0.0)
176 descendants_tracker (~> 0.0.1) 182 descendants_tracker (~> 0.0.1)
177 concurrent-ruby (1.0.0) 183 concurrent-ruby (1.0.0)
  184 + coolline (0.5.0)
  185 + unicode_utils (~> 1.4)
178 cucumber (1.3.20) 186 cucumber (1.3.20)
179 builder (>= 2.1.2) 187 builder (>= 2.1.2)
180 diff-lcs (>= 1.1.3) 188 diff-lcs (>= 1.1.3)
@@ -239,10 +247,19 @@ GEM @@ -239,10 +247,19 @@ GEM
239 grape_logging (1.1.2) 247 grape_logging (1.1.2)
240 grape 248 grape
241 hashie (3.4.3) 249 hashie (3.4.3)
  250 + hirb (0.7.3)
242 http-cookie (1.0.2) 251 http-cookie (1.0.2)
243 domain_name (~> 0.5) 252 domain_name (~> 0.5)
244 i18n (0.7.0) 253 i18n (0.7.0)
245 ice_nine (0.11.1) 254 ice_nine (0.11.1)
  255 + jazz_fingers (3.0.0)
  256 + awesome_print (~> 1.6)
  257 + hirb (~> 0.7)
  258 + pry (~> 0.10)
  259 + pry-byebug (~> 3.1)
  260 + pry-coolline (~> 0.2)
  261 + pry-doc (~> 0.6)
  262 + pry-remote (>= 0.1.7)
246 json (1.8.3) 263 json (1.8.3)
247 kgio (2.10.0) 264 kgio (2.10.0)
248 kramdown (1.9.0) 265 kramdown (1.9.0)
@@ -257,6 +274,7 @@ GEM @@ -257,6 +274,7 @@ GEM
257 mail (2.6.3) 274 mail (2.6.3)
258 mime-types (>= 1.16, < 3) 275 mime-types (>= 1.16, < 3)
259 metaclass (0.0.4) 276 metaclass (0.0.4)
  277 + method_source (0.8.2)
260 mime-types (2.99) 278 mime-types (2.99)
261 mini_portile2 (2.0.0) 279 mini_portile2 (2.0.0)
262 minitest (5.8.3) 280 minitest (5.8.3)
@@ -278,6 +296,21 @@ GEM @@ -278,6 +296,21 @@ GEM
278 power_assert (0.2.6) 296 power_assert (0.2.6)
279 protected_attributes (1.1.3) 297 protected_attributes (1.1.3)
280 activemodel (>= 4.0.1, < 5.0) 298 activemodel (>= 4.0.1, < 5.0)
  299 + pry (0.10.3)
  300 + coderay (~> 1.1.0)
  301 + method_source (~> 0.8.1)
  302 + slop (~> 3.4)
  303 + pry-byebug (3.3.0)
  304 + byebug (~> 8.0)
  305 + pry (~> 0.10)
  306 + pry-coolline (0.2.5)
  307 + coolline (~> 0.5)
  308 + pry-doc (0.8.0)
  309 + pry (~> 0.9)
  310 + yard (~> 0.8)
  311 + pry-remote (0.1.8)
  312 + pry (~> 0.9)
  313 + slop (~> 3.0)
281 rack (1.6.4) 314 rack (1.6.4)
282 rack-accept (0.4.5) 315 rack-accept (0.4.5)
283 rack (>= 0.4) 316 rack (>= 0.4)
@@ -348,7 +381,7 @@ GEM @@ -348,7 +381,7 @@ GEM
348 ruby-feedparser (0.9.3) 381 ruby-feedparser (0.9.3)
349 magic 382 magic
350 ruby-progressbar (1.7.5) 383 ruby-progressbar (1.7.5)
351 - rubyzip (1.1.7) 384 + rubyzip (1.2.0)
352 sass (3.4.20) 385 sass (3.4.20)
353 sass-rails (5.0.4) 386 sass-rails (5.0.4)
354 railties (>= 4.0.0, < 5.0) 387 railties (>= 4.0.0, < 5.0)
@@ -356,7 +389,7 @@ GEM @@ -356,7 +389,7 @@ GEM
356 sprockets (>= 2.8, < 4.0) 389 sprockets (>= 2.8, < 4.0)
357 sprockets-rails (>= 2.0, < 4.0) 390 sprockets-rails (>= 2.0, < 4.0)
358 tilt (>= 1.1, < 3) 391 tilt (>= 1.1, < 3)
359 - selenium-webdriver (2.48.1) 392 + selenium-webdriver (2.52.0)
360 childprocess (~> 0.5) 393 childprocess (~> 0.5)
361 multi_json (~> 1.0) 394 multi_json (~> 1.0)
362 rubyzip (~> 1.0) 395 rubyzip (~> 1.0)
@@ -364,6 +397,7 @@ GEM @@ -364,6 +397,7 @@ GEM
364 slim (3.0.6) 397 slim (3.0.6)
365 temple (~> 0.7.3) 398 temple (~> 0.7.3)
366 tilt (>= 1.3.3, < 2.1) 399 tilt (>= 1.3.3, < 2.1)
  400 + slop (3.6.0)
367 spring (1.6.1) 401 spring (1.6.1)
368 sprockets (3.5.2) 402 sprockets (3.5.2)
369 concurrent-ruby (~> 1.0) 403 concurrent-ruby (~> 1.0)
@@ -388,6 +422,7 @@ GEM @@ -388,6 +422,7 @@ GEM
388 unf (0.1.4) 422 unf (0.1.4)
389 unf_ext 423 unf_ext
390 unf_ext (0.0.7.1) 424 unf_ext (0.0.7.1)
  425 + unicode_utils (1.4.0)
391 unicorn (4.9.0) 426 unicorn (4.9.0)
392 kgio (~> 2.6) 427 kgio (~> 2.6)
393 rack 428 rack
@@ -403,6 +438,7 @@ GEM @@ -403,6 +438,7 @@ GEM
403 will_paginate (3.0.7) 438 will_paginate (3.0.7)
404 xpath (2.0.0) 439 xpath (2.0.0)
405 nokogiri (~> 1.3) 440 nokogiri (~> 1.3)
  441 + yard (0.8.7.6)
406 442
407 PLATFORMS 443 PLATFORMS
408 ruby 444 ruby
@@ -421,6 +457,7 @@ DEPENDENCIES @@ -421,6 +457,7 @@ DEPENDENCIES
421 acts_as_list (= 0.0.0)! 457 acts_as_list (= 0.0.0)!
422 acts_as_tree (= 0.0.0)! 458 acts_as_tree (= 0.0.0)!
423 acts_as_versioned (> 0.0.0)! 459 acts_as_versioned (> 0.0.0)!
  460 + airbrake (~> 4)
424 api-pagination (~> 4.1.1) 461 api-pagination (~> 4.1.1)
425 capybara (~> 2.2) 462 capybara (~> 2.2)
426 contacts (> 0.0.0)! 463 contacts (> 0.0.0)!
@@ -439,11 +476,12 @@ DEPENDENCIES @@ -439,11 +476,12 @@ DEPENDENCIES
439 gdata (> 0.0.0)! 476 gdata (> 0.0.0)!
440 gettext (~> 3.1) 477 gettext (~> 3.1)
441 grape (~> 0.12) 478 grape (~> 0.12)
442 - grape-entity (~> 0.4.8) 479 + grape-entity (= 0.4.8)
443 grape-swagger 480 grape-swagger
444 grape_logging 481 grape_logging
445 honeypot (= 0.0.0)! 482 honeypot (= 0.0.0)!
446 i18n_deprecation (= 0.0.0)! 483 i18n_deprecation (= 0.0.0)!
  484 + jazz_fingers
447 kandadaboggu-vote_fu (> 0.0.0)! 485 kandadaboggu-vote_fu (> 0.0.0)!
448 kramdown 486 kramdown
449 launchy 487 launchy
@@ -474,7 +512,7 @@ DEPENDENCIES @@ -474,7 +512,7 @@ DEPENDENCIES
474 ruby-feedparser (~> 0.7) 512 ruby-feedparser (~> 0.7)
475 ruby_bosh (> 0.0.0)! 513 ruby_bosh (> 0.0.0)!
476 sass-rails 514 sass-rails
477 - selenium-webdriver 515 + selenium-webdriver (>= 2.50)
478 slim 516 slim
479 spring 517 spring
480 sprockets-rails (~> 2.1) 518 sprockets-rails (~> 2.1)
@@ -485,5 +523,5 @@ DEPENDENCIES @@ -485,5 +523,5 @@ DEPENDENCIES
485 validates_as_cnpj (= 0.0.0)! 523 validates_as_cnpj (= 0.0.0)!
486 validates_multiparameter_assignments (= 0.0.0)! 524 validates_multiparameter_assignments (= 0.0.0)!
487 whenever 525 whenever
488 - will_paginate 526 + will_paginate (~> 3.0.7)
489 xss_terminate (= 0.0.0)! 527 xss_terminate (= 0.0.0)!
config/initializers/errbit.rb 0 → 100644
  Diff comments   View file @ca0b4be
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
  1 +Airbrake.configure do |config|
  2 + config.api_key = '50c752b287f566a31e2adc9e84e379bc'
  3 + config.host = 'diagnostico.participa.br'
  4 + config.port = 80
  5 + config.secure = config.port == 443
  6 +end