Commit f3b48953d0778d8d4d8bbc668228d397dc3d0fc1
1 parent
d1300777
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
removing merge conflit
Showing
1 changed file
with
0 additions
and
4 deletions
Show diff stats
lib/noosfero/api/helpers.rb
| @@ -390,9 +390,6 @@ | @@ -390,9 +390,6 @@ | ||
| 390 | request = Net::HTTP::Post.new(uri.path) | 390 | request = Net::HTTP::Post.new(uri.path) |
| 391 | verify_string = "#{client_id}&#{token}&#{captcha_text}" | 391 | verify_string = "#{client_id}&#{token}&#{captcha_text}" |
| 392 | request.body = verify_string | 392 | request.body = verify_string |
| 393 | -<<<<<<< HEAD | ||
| 394 | - body = http.request(request).body | ||
| 395 | -======= | ||
| 396 | begin | 393 | begin |
| 397 | body = http.request(request).body | 394 | body = http.request(request).body |
| 398 | rescue Exception => e | 395 | rescue Exception => e |
| @@ -401,7 +398,6 @@ | @@ -401,7 +398,6 @@ | ||
| 401 | end | 398 | end |
| 402 | return _("Wrong captcha text, please try again") if body == 0 | 399 | return _("Wrong captcha text, please try again") if body == 0 |
| 403 | return _("Token not found") if body == 2 | 400 | return _("Token not found") if body == 2 |
| 404 | ->>>>>>> serpro_api | ||
| 405 | body == '1' ? true : body | 401 | body == '1' ? true : body |
| 406 | end | 402 | end |
| 407 | 403 |