Author: Hugo Melo <hugo@riseup.net>
Merge branch 'master' of https://github.com/samasti/noosfero
Gemfile.lock | 197 +++++++++++++--------- app/views/content_viewer/view_page.html.erb | 6 config/Gemfile | 3
diff --git a/Gemfile.lock b/Gemfile.lock index e38ece4cc54f9d3d507bf5cf8d97c2939b22721d..ecfde0a40d9c2c9cc4934ea7a3040887fe8a842e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,16 +1,9 @@ GIT remote: git://github.com/coletivoEITA/acts_as_solr_reloaded.git - revision: fb797353c7358b6b1b045d866a517409b5b29306 - ref: fb79735 + revision: a04ff0c8b48e6c128166bc9e95b9ab1b865f45e8 + ref: a04ff0c specs: acts_as_solr_reloaded (1.6.0) - -GIT - remote: git://github.com/coletivoEITA/i18n-js.git - revision: b47088c555fbe057bb70ec871677a9a1848b22e4 - specs: - i18n-js (3.0.0.rc11) - i18n (~> 0.6) PATH remote: vendor/contacts @@ -171,11 +164,12 @@ activerecord (>= 3.2, < 5) addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) ansi (1.5.0) - api-pagination (4.5.2) + api-pagination (4.6.3) arel (6.0.4) assets_live_compile (0.2.1) activesupport (>= 3.1) rails (>= 3.1) + attr_required (1.0.1) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) @@ -194,9 +188,9 @@ erubis (>= 2.6.6) rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - browser (2.3.0) + browser (2.4.0) builder (3.2.3) - capybara (2.13.0) + capybara (2.14.0) addressable mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -204,14 +198,14 @@ rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) charlock_holmes (0.7.3) - childprocess (0.6.3) + childprocess (0.7.0) ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) coderay (1.1.1) coercible (1.0.0) descendants_tracker (~> 0.0.1) concurrent-ruby (1.0.5) - css_parser (1.4.9) + css_parser (1.5.0) addressable cucumber (1.3.20) builder (>= 2.1.2) @@ -227,12 +221,12 @@ nokogiri (~> 1.5) railties (>= 3, < 5.1) daemons (1.2.4) dalli (2.7.6) - database_cleaner (1.5.3) - debug_inspector (0.0.2) - delayed_job (4.1.2) - activesupport (>= 3.0, < 5.1) - delayed_job_active_record (4.1.1) - activerecord (>= 3.0, < 5.1) + database_cleaner (1.6.1) + debug_inspector (0.0.3) + delayed_job (4.1.3) + activesupport (>= 3.0, < 5.2) + delayed_job_active_record (4.1.2) + activerecord (>= 3.0, < 5.2) delayed_job (>= 3.0, < 5) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) @@ -240,7 +234,7 @@ diff-lcs (1.3) diffy (3.2.0) domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) - dotenv (2.2.0) + dotenv (2.2.1) eita-jrails (0.10.1) actionpack (>= 3.1.0) activesupport (>= 3.0.0) @@ -250,13 +244,25 @@ exception_notification (4.0.1) actionmailer (>= 3.0.4) activesupport (>= 3.0.4) execjs (2.7.0) + facebook-signed-request (0.2.7) faraday (0.11.0) multipart-post (>= 1.2, < 3) fast_blank (1.0.0) fast_gettext (0.9.2) + fb_graph (2.7.17) + httpclient (>= 2.4) + multi_json (>= 1.3) + rack-oauth2 (>= 0.14.4) + tzinfo + fb_graph2 (0.9.1) + activesupport (>= 3.2) + httpclient (>= 2.4) + multi_json + rack-oauth2 (>= 1.1) + url_safe_base64 ffi (1.9.18) flamegraph (0.9.5) - geocoder (1.4.3) + geocoder (1.4.4) get_process_mem (0.2.1) gettext (3.2.2) locale (>= 2.0.5) @@ -264,8 +270,8 @@ text (>= 1.3.0) gherkin (2.12.2) multi_json (~> 1.3) git-version-bump (0.15.1) - globalid (0.3.7) - activesupport (>= 4.1.0) + globalid (0.4.0) + activesupport (>= 4.2.0) grape (0.19.2) activesupport builder @@ -279,41 +285,50 @@ virtus (>= 1.0.0) grape-entity (0.4.8) activesupport multi_json (>= 1.3.2) - grape_logging (1.4.0) + grape_logging (1.5.0) grape - haml (4.0.7) + haml (5.0.1) + temple (>= 0.8.0) tilt haml2slim (0.4.7) haml (>= 3.0) nokogiri ruby_parser hashie (3.5.5) - html2haml (2.1.0) + html2haml (2.2.0) erubis (~> 2.7.0) - haml (~> 4.0) + haml (>= 4.0, < 6) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) htmlentities (4.3.4) http-cookie (1.0.3) domain_name (~> 0.5) + httpclient (2.8.3) i18n (0.8.1) + i18n-js (3.0.0) + i18n (~> 0.6, >= 0.6.6) ice_nine (0.11.2) js-routes (1.2.6) railties (>= 3.2) sprockets-rails - json (2.0.4) + json (2.1.0) + jsonify (0.3.1) + multi_json (~> 1.0) + jsonify-rails (0.3.2) + actionpack + jsonify (< 0.4.0) jwt (1.5.6) kgio (2.11.0) launchy (2.4.3) addressable (~> 2.3) - libv8 (3.16.14.17) + libv8 (3.16.14.19) liquid (4.0.0) locale (2.1.2) loofah (2.0.3) nokogiri (>= 1.5.9) magic (0.2.9) ffi (>= 0.6.3) - mail (2.6.4) + mail (2.6.5) mime-types (>= 1.16, < 4) mailgun_rails (0.9.0) actionmailer (>= 3.2.13) @@ -325,7 +340,7 @@ metaclass (0.0.4) method_source (0.8.2) mime-types (2.99.3) mini_portile2 (2.1.0) - minitest (5.10.1) + minitest (5.10.2) minitest-reporters (1.1.14) ansi builder @@ -341,22 +356,24 @@ mustermann (1.0.0) mustermann-grape (1.0.0) mustermann (~> 1.0.0) netrc (0.11.0) - newrelic_rpm (3.18.1.330) + newrelic_rpm (4.2.0.334) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - oauth (0.5.1) + oauth (0.5.3) oauth2 (1.3.1) faraday (>= 0.8, < 0.12) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) + oj (2.17.5) + oj_mimic_json (1.0.1) omniauth (1.6.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) - omniauth-github (1.2.3) + omniauth-github (1.3.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) omniauth-google-oauth2 (0.4.1) @@ -375,14 +392,15 @@ omniauth-oauth (~> 1.1) rack pg (0.20.0) pothoven-attachment_fu (3.2.18) - power_assert (1.0.1) - premailer (1.10.0) - css_parser (>= 1.4.9) + power_assert (1.0.2) + premailer (1.10.4) + addressable + css_parser (>= 1.4.10) htmlentities (>= 4.0.0) - premailer-rails (1.9.5) + premailer-rails (1.9.6) actionmailer (>= 3, < 6) premailer (~> 1.7, >= 1.7.9) - protected_attributes (1.1.3) + protected_attributes (1.1.4) activemodel (>= 4.0.1, < 5.0) pry (0.10.4) coderay (~> 1.1.0) @@ -390,18 +408,25 @@ method_source (~> 0.8.1) slop (~> 3.4) public_suffix (2.0.5) puma (3.8.2) - puma_worker_killer (0.0.7) + puma_worker_killer (0.1.0) get_process_mem (~> 0.2) puma (>= 2.7, < 4) - rack (1.6.5) + rack (1.6.8) rack-accept (0.4.5) rack (>= 0.4) rack-contrib (1.4.0) git-version-bump (~> 0.15) rack (~> 1.4) rack-cors (0.4.1) + rack-oauth2 (1.6.2) + activesupport (>= 2.3) + attr_required (>= 0.0.5) + httpclient (>= 2.4) + multi_json (>= 1.3.6) + rack (>= 1.1) rack-test (0.6.3) rack (>= 1.0) + rack-timeout (0.4.2) rails (4.2.8) actionmailer (= 4.2.8) actionpack (= 4.2.8) @@ -432,22 +457,23 @@ rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.18.0) rake (12.0.0) + rakismet (1.5.3) redis (3.3.3) redis-actionpack (5.0.1) actionpack (>= 4.0, < 6) redis-rack (>= 1, < 3) redis-store (>= 1.1.0, < 1.4.0) - redis-activesupport (5.0.1) + redis-activesupport (5.0.2) activesupport (>= 3, < 6) - redis-store (~> 1.2.0) - redis-rack (1.6.0) - rack (~> 1.5) - redis-store (~> 1.2.0) - redis-rails (5.0.1) - redis-actionpack (~> 5.0.0) - redis-activesupport (~> 5.0.0) - redis-store (~> 1.2.0) - redis-store (1.2.0) + redis-store (~> 1.3.0) + redis-rack (2.0.2) + rack (>= 1.5, < 3) + redis-store (>= 1.2, < 1.4) + redis-rails (5.0.2) + redis-actionpack (>= 5.0, < 6) + redis-activesupport (>= 5.0, < 6) + redis-store (>= 1.2, < 2) + redis-store (1.3.0) redis (>= 2.2) ref (2.0.0) rest-client (1.8.0) @@ -458,36 +484,36 @@ riot_js-rails (0.7.1) execjs (~> 2) rails (>= 3.0, < 6.0) rmagick (2.16.0) - rollbar (2.14.0) + rollbar (2.14.1) multi_json - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec (3.6.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-core (3.6.0) + rspec-support (~> 3.6.0) + rspec-expectations (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.6.0) + rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.2) + rspec-support (~> 3.6.0) + rspec-rails (3.6.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.6.0) + rspec-expectations (~> 3.6.0) + rspec-mocks (~> 3.6.0) + rspec-support (~> 3.6.0) + rspec-support (3.6.0) ruby-feedparser (0.9.4) magic ruby-progressbar (1.8.1) - ruby_parser (3.8.4) + ruby_parser (3.9.0) sexp_processor (~> 4.1) rubyzip (1.0.0) - sass (3.4.23) + sass (3.4.24) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -498,12 +524,12 @@ selenium-webdriver (2.53.4) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) - sexp_processor (4.8.0) - slim (3.0.7) - temple (~> 0.7.6) + sexp_processor (4.9.0) + slim (3.0.8) + temple (>= 0.7.6, < 0.9) tilt (>= 1.3.3, < 2.1) slop (3.6.0) - spring (2.0.1) + spring (2.0.2) activesupport (>= 4.2) sprockets (3.7.1) concurrent-ruby (~> 1.0) @@ -517,8 +543,8 @@ actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) stackprof (0.2.10) - temple (0.7.7) - test-unit (3.2.3) + temple (0.8.0) + test-unit (3.2.4) power_assert text (1.3.1) therubyracer (0.12.3) @@ -533,8 +559,8 @@ uglifier (3.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.3) - unicode (0.4.4.2) + unf_ext (0.0.7.4) + unicode (0.4.4.4) unicorn (4.9.0) kgio (~> 2.6) rack @@ -542,6 +568,7 @@ raindrops (~> 0.7) unicorn-worker-killer (0.4.4) get_process_mem (~> 0) unicorn (>= 4, < 6) + url_safe_base64 (0.2.2) utf8-cleaner (0.2.5) activesupport virtus (1.0.5) @@ -555,7 +582,7 @@ chronic (>= 0.6.3) will-paginate-i18n (0.1.15) will_paginate (3.0.12) wirble (0.1.3) - xpath (2.0.0) + xpath (2.1.0) nokogiri (~> 1.3) PLATFORMS @@ -598,8 +625,11 @@ dotenv eita-jrails (~> 0.10.0) exception_notification (~> 4.0.1) ezcrypto (= 0.0.0)! + facebook-signed-request fast_blank fast_gettext (~> 0.9) + fb_graph + fb_graph2 flamegraph gdata (> 0.0.0)! geocoder @@ -610,9 +640,10 @@ grape_logging haml2slim honeypot (= 0.0.0)! html2haml - i18n-js! + i18n-js i18n_deprecation (= 0.0.0)! js-routes (= 1.2.6) + jsonify-rails kandadaboggu-vote_fu (> 0.0.0)! launchy liquid (>= 3.0.3) @@ -625,6 +656,8 @@ mocha (~> 1.1.0) monkey_patches (= 0.0.0)! newrelic_rpm nokogiri (~> 1.6.0) + oj (~> 2.0) + oj_mimic_json omniauth omniauth-facebook omniauth-github @@ -639,11 +672,13 @@ pry puma_worker_killer rack-contrib rack-cors + rack-timeout rails (~> 4.2.7) rails-observers rails_autolink (~> 1.1.5) rails_rcov (= 0.0.0)! rake + rakismet (~> 1.5.0) recaptcha (> 0.0.0)! redis-rails rest-client (~> 1.6) diff --git a/app/views/content_viewer/view_page.html.erb b/app/views/content_viewer/view_page.html.erb index 72ce525e7e858923d914f22c692bf2f5b0b7e7da..97924343e375d3a68627555f28d489e4572ac1c1 100644 --- a/app/views/content_viewer/view_page.html.erb +++ b/app/views/content_viewer/view_page.html.erb @@ -31,12 +31,6 @@ <% cache_if @page.cacheable?, @page.cache_key(params, user, language) do %> <div class="<%="article-body article-body-" + @page.css_class_name %>"> <% options = @page.image? ? {:gallery_view => true} : {} %> - <% if @page.image.present? && !@page.event? && !@page.blog? %> - <div class="article-body-img"> - <%= image_tag(@page.image.public_filename) %> - <p><%= @page.image.label%></p> - </div> - <% end %> <%= article_to_html(@page, options) %> <br style="clear:both" /> </div> <!-- end class="article-body" --> diff --git a/config/Gemfile b/config/Gemfile index 6d0efd2ad41ff170260b91c2746f34df27f9430a..b79f99bb8b70ff03a2f71bd18833a983819e11de 100644 --- a/config/Gemfile +++ b/config/Gemfile @@ -46,8 +46,9 @@ platform :ruby do gem 'unicode' group :performance do + # FIXME: stack level too deep - gem 'oj' + gem 'oj', '~> 2.0' gem 'oj_mimic_json' gem 'fast_blank'