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