[devdocsgjs/main: 1105/1867] Fix merge conflicts

[Andy Holmes <andyholmes src gnome org>]

commit 7ca18dd5d4e7035514d6e681d03a3c7f520b299d
Merge: f1b464b1 8677f33a
Author: Jasper van Merle <jaspervmerle gmail com>
Date:   Fri Nov 13 01:21:33 2020 +0100

    Fix merge conflicts

 Gemfile.lock                                         |  2 +-
 assets/javascripts/templates/pages/about_tmpl.coffee | 14 +++++++-------
 assets/stylesheets/application.css.scss              |  2 +-
 lib/docs/filters/haxe/clean_html.rb                  |  6 ++++--
 lib/docs/filters/jest/entries.rb                     |  1 +
 lib/docs/filters/leaflet/clean_html.rb               | 14 +++++++-------
 lib/docs/scrapers/angularjs.rb                       |  9 +++++++--
 lib/docs/scrapers/dart.rb                            |  3 ++-
 lib/docs/scrapers/gnuplot.rb                         |  5 +++--
 lib/docs/scrapers/go.rb                              |  2 +-
 lib/docs/scrapers/haxe.rb                            | 10 +++++++---
 lib/docs/scrapers/jest.rb                            |  4 ++--
 lib/docs/scrapers/leaflet.rb                         |  5 +++++
 lib/docs/scrapers/lua.rb                             |  9 +++++++--
 lib/docs/scrapers/node.rb                            |  7 ++++++-
 lib/docs/scrapers/pandas.rb                          |  3 +--
 lib/docs/scrapers/postgresql.rb                      |  7 ++++++-
 lib/docs/scrapers/python.rb                          | 14 +++++++++++---
 lib/docs/scrapers/sqlite.rb                          |  2 +-
 public/icons/docs/postgresql/SOURCE                  |  2 +-
 20 files changed, 81 insertions(+), 40 deletions(-)
---
diff --cc lib/docs/scrapers/gnuplot.rb
index 4753e195,d6d5b195..d63f0dea
--- a/lib/docs/scrapers/gnuplot.rb
+++ b/lib/docs/scrapers/gnuplot.rb
@@@ -38,8 -38,10 +38,9 @@@ module Doc
      HTML
  
      def get_latest_version(opts)
-       doc = fetch_doc('https://sourceforge.net/projects/gnuplot/files/gnuplot/', opts)
-       doc.at_css('#files_list > tbody > tr:nth-child(2)')['title']
+       doc = fetch_doc('http://www.gnuplot.info/download.html', opts)
+       label = doc.at_css('h2').content.strip
+       label.sub(/[^0-9.]*/, '')
      end
 -
    end
  end