[devdocsgjs/main: 828/1867] Fix merge conflict
- From: Andy Holmes <andyholmes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [devdocsgjs/main: 828/1867] Fix merge conflict
- Date: Fri, 19 Nov 2021 23:47:31 +0000 (UTC)
commit 20438856d146f8f56668133448a2e3f1f8647d71
Merge: 5da02147 22f7bcf9
Author: Jasper van Merle <jaspervmerle gmail com>
Date: Thu Aug 15 20:33:41 2019 +0200
Fix merge conflict
.editorconfig | 3 +
.github/CONTRIBUTING.md | 24 +-
.github/ISSUE_TEMPLATE.md | 2 +-
.gitignore | 8 +-
.ruby-version | 2 +-
.slugignore | 3 +-
.travis.yml | 21 +-
CODE_OF_CONDUCT.md | 2 +
COPYRIGHT | 8 +-
Dockerfile | 5 +-
Dockerfile-alpine | 5 +-
Gemfile | 7 +-
Gemfile.lock | 115 ++++----
PULL_REQUEST_TEMPLATE.md | 11 +
README.md | 65 +++--
assets/images/.gitignore | 1 +
assets/images/docs-1.png | Bin 46181 -> 0 bytes
assets/images/docs-1 2x png | Bin 122108 -> 0 bytes
assets/images/docs-2.png | Bin 20060 -> 0 bytes
assets/images/docs-2 2x png | Bin 48657 -> 0 bytes
assets/javascripts/app/app.coffee | 23 +-
assets/javascripts/app/appcache.coffee | 42 ---
assets/javascripts/app/config.coffee.erb | 3 +
assets/javascripts/app/serviceworker.coffee | 49 ++++
assets/javascripts/app/settings.coffee | 35 ++-
assets/javascripts/app/update_checker.coffee | 6 +-
.../{cookie_store.coffee => cookies_store.coffee} | 6 +-
assets/javascripts/lib/favicon.coffee | 64 +++++
assets/javascripts/lib/license.coffee | 2 +-
assets/javascripts/lib/page.coffee | 18 +-
assets/javascripts/lib/util.coffee | 4 +
assets/javascripts/models/doc.coffee | 4 +-
assets/javascripts/news.json | 8 +
assets/javascripts/templates/error_tmpl.coffee | 16 +-
assets/javascripts/templates/notif_tmpl.coffee | 6 +
.../javascripts/templates/pages/about_tmpl.coffee | 89 ++++--
.../templates/pages/offline_tmpl.coffee | 13 +-
.../templates/pages/root_tmpl.coffee.erb | 6 +-
.../templates/pages/settings_tmpl.coffee | 8 +
assets/javascripts/tracking.js | 50 ++--
assets/javascripts/vendor/fastclick.js | 4 +-
assets/javascripts/vendor/raven.js | 2 +-
assets/javascripts/views/content/content.coffee | 3 +
assets/javascripts/views/content/entry_page.coffee | 3 +-
.../javascripts/views/content/settings_page.coffee | 21 +-
assets/javascripts/views/content/type_page.coffee | 1 +
assets/javascripts/views/layout/document.coffee | 12 +-
assets/javascripts/views/layout/resizer.coffee | 11 +-
assets/javascripts/views/layout/settings.coffee | 10 +-
assets/javascripts/views/search/search.coffee | 8 +
.../javascripts/views/search/search_scope.coffee | 28 +-
assets/javascripts/views/sidebar/sidebar.coffee | 2 +-
assets/stylesheets/application.css.scss | 12 +-
assets/stylesheets/components/_fail.scss | 2 -
assets/stylesheets/components/_header.scss | 1 +
assets/stylesheets/components/_notif.scss | 4 +
assets/stylesheets/global/_icons.scss | 182 ------------
assets/stylesheets/global/_icons.scss.erb | 43 +++
assets/stylesheets/pages/_cypress.scss | 21 ++
assets/stylesheets/pages/_rdoc.scss | 11 -
assets/stylesheets/pages/_scala.scss | 4 +
assets/stylesheets/pages/_wordpress.scss | 15 +
docs/adding-docs.md | 24 ++
docs/filter-reference.md | 224 +++++++++++++++
docs/maintainers.md | 102 +++++++
docs/scraper-reference.md | 227 +++++++++++++++
lib/app.rb | 66 +++--
lib/docs/core/doc.rb | 100 ++++++-
lib/docs/core/requester.rb | 2 +-
lib/docs/core/scrapers/file_scraper.rb | 4 +-
lib/docs/core/url.rb | 2 +-
lib/docs/filters/cmake/entries.rb | 1 +
lib/docs/filters/composer/clean_html.rb | 35 +++
lib/docs/filters/composer/entries.rb | 36 +++
lib/docs/filters/cypress/clean_html.rb | 26 ++
lib/docs/filters/cypress/entries.rb | 34 +++
lib/docs/filters/elixir/clean_html.rb | 5 +
lib/docs/filters/go/clean_html.rb | 1 +
lib/docs/filters/homebrew/clean_html.rb | 5 +
lib/docs/filters/homebrew/entries.rb | 4 +-
lib/docs/filters/kotlin/clean_html.rb | 7 +
lib/docs/filters/kotlin/entries.rb | 4 +-
lib/docs/filters/pandas/entries.rb | 8 +-
lib/docs/filters/pony/clean_html.rb | 16 ++
lib/docs/filters/pony/entries.rb | 35 +++
lib/docs/filters/pygame/clean_html.rb | 2 +-
lib/docs/filters/python/entries_v2.rb | 8 +-
lib/docs/filters/python/entries_v3.rb | 10 +-
lib/docs/filters/qt/clean_html.rb | 1 +
lib/docs/filters/qt/entries.rb | 1 +
lib/docs/filters/ramda/clean_html.rb | 2 +-
lib/docs/filters/rdoc/clean_html.rb | 6 +-
lib/docs/filters/salt_stack/clean_html.rb | 27 ++
lib/docs/filters/salt_stack/entries.rb | 38 +++
lib/docs/filters/scala/clean_html.rb | 109 +++++++
lib/docs/filters/scala/entries.rb | 103 +++++++
lib/docs/filters/vue_router/clean_html.rb | 21 ++
lib/docs/filters/vue_router/entries.rb | 71 +++++
lib/docs/filters/vuex/clean_html.rb | 17 ++
lib/docs/filters/vuex/entries.rb | 69 +++++
lib/docs/filters/wordpress/clean_html.rb | 39 +++
lib/docs/filters/wordpress/entries.rb | 19 ++
lib/docs/scrapers/angular.rb | 4 +
lib/docs/scrapers/angularjs.rb | 19 +-
lib/docs/scrapers/ansible.rb | 81 ++----
lib/docs/scrapers/apache.rb | 5 +
lib/docs/scrapers/apache_pig.rb | 5 +
lib/docs/scrapers/async.rb | 5 +
lib/docs/scrapers/babel.rb | 5 +
lib/docs/scrapers/backbone.rb | 5 +
lib/docs/scrapers/bash.rb | 7 +-
lib/docs/scrapers/bluebird.rb | 4 +
lib/docs/scrapers/bootstrap.rb | 14 +-
lib/docs/scrapers/bottle.rb | 6 +
lib/docs/scrapers/bower.rb | 4 +
lib/docs/scrapers/c.rb | 7 +
lib/docs/scrapers/cakephp.rb | 5 +
lib/docs/scrapers/chai.rb | 4 +
lib/docs/scrapers/chef.rb | 5 +
lib/docs/scrapers/clojure.rb | 18 +-
lib/docs/scrapers/cmake.rb | 43 ++-
lib/docs/scrapers/codeception.rb | 5 +
lib/docs/scrapers/codeceptjs.rb | 4 +
lib/docs/scrapers/codeigniter.rb | 6 +
lib/docs/scrapers/coffeescript.rb | 4 +
lib/docs/scrapers/composer.rb | 28 ++
lib/docs/scrapers/cordova.rb | 10 +
lib/docs/scrapers/cpp.rb | 8 +
lib/docs/scrapers/crystal.rb | 5 +
lib/docs/scrapers/cypress.rb | 36 +++
lib/docs/scrapers/d.rb | 5 +
lib/docs/scrapers/d3.rb | 4 +
lib/docs/scrapers/dart.rb | 6 +
lib/docs/scrapers/django.rb | 16 +-
lib/docs/scrapers/docker.rb | 179 ++++++++++--
lib/docs/scrapers/dojo.rb | 5 +
lib/docs/scrapers/drupal.rb | 5 +
lib/docs/scrapers/electron.rb | 5 +
lib/docs/scrapers/elixir.rb | 35 ++-
lib/docs/scrapers/ember.rb | 5 +
lib/docs/scrapers/erlang.rb | 5 +
lib/docs/scrapers/eslint.rb | 4 +
lib/docs/scrapers/express.rb | 4 +
lib/docs/scrapers/falcon.rb | 5 +
lib/docs/scrapers/fish.rb | 11 +
lib/docs/scrapers/flow.rb | 4 +
lib/docs/scrapers/git.rb | 5 +
lib/docs/scrapers/gnu/gcc.rb | 6 +
lib/docs/scrapers/gnu/gnu_fortran.rb | 6 +
lib/docs/scrapers/go.rb | 7 +-
lib/docs/scrapers/godot.rb | 5 +
lib/docs/scrapers/graphite.rb | 5 +
lib/docs/scrapers/grunt.rb | 4 +
lib/docs/scrapers/handlebars.rb | 4 +
lib/docs/scrapers/haskell.rb | 9 +-
lib/docs/scrapers/haxe.rb | 6 +
lib/docs/scrapers/homebrew.rb | 6 +-
lib/docs/scrapers/http.rb | 2 +
lib/docs/scrapers/immutable.rb | 4 +
lib/docs/scrapers/influxdata.rb | 6 +
lib/docs/scrapers/jasmine.rb | 4 +
lib/docs/scrapers/jekyll.rb | 5 +
lib/docs/scrapers/jest.rb | 5 +
lib/docs/scrapers/jquery/jquery_core.rb | 4 +
lib/docs/scrapers/jquery/jquery_mobile.rb | 5 +
lib/docs/scrapers/jquery/jquery_ui.rb | 4 +
lib/docs/scrapers/jsdoc.rb | 4 +
lib/docs/scrapers/julia.rb | 4 +
lib/docs/scrapers/knockout.rb | 4 +
lib/docs/scrapers/koa.rb | 4 +
lib/docs/scrapers/kotlin.rb | 18 +-
lib/docs/scrapers/laravel.rb | 4 +
lib/docs/scrapers/leaflet.rb | 17 +-
lib/docs/scrapers/less.rb | 6 +
lib/docs/scrapers/liquid.rb | 5 +
lib/docs/scrapers/lodash.rb | 5 +
lib/docs/scrapers/love.rb | 5 +
lib/docs/scrapers/lua.rb | 5 +
lib/docs/scrapers/marionette.rb | 4 +
lib/docs/scrapers/markdown.rb | 4 +
lib/docs/scrapers/matplotlib.rb | 13 +
lib/docs/scrapers/mdn/css.rb | 2 +
lib/docs/scrapers/mdn/dom.rb | 2 +
lib/docs/scrapers/mdn/dom_events.rb | 2 +
lib/docs/scrapers/mdn/html.rb | 2 +
lib/docs/scrapers/mdn/javascript.rb | 2 +
lib/docs/scrapers/mdn/mdn.rb | 5 +
lib/docs/scrapers/mdn/svg.rb | 2 +
lib/docs/scrapers/mdn/xslt_xpath.rb | 2 +
lib/docs/scrapers/meteor.rb | 5 +
lib/docs/scrapers/mocha.rb | 4 +
lib/docs/scrapers/modernizr.rb | 4 +
lib/docs/scrapers/moment.rb | 5 +
lib/docs/scrapers/mongoose.rb | 6 +
lib/docs/scrapers/nginx.rb | 14 +-
lib/docs/scrapers/nginx_lua_module.rb | 9 +
lib/docs/scrapers/nim.rb | 5 +
lib/docs/scrapers/node.rb | 9 +-
lib/docs/scrapers/nokogiri2.rb | 15 +-
lib/docs/scrapers/npm.rb | 4 +
lib/docs/scrapers/numpy.rb | 4 +
lib/docs/scrapers/openjdk.rb | 20 ++
lib/docs/scrapers/opentsdb.rb | 4 +
lib/docs/scrapers/padrino.rb | 10 +-
lib/docs/scrapers/pandas.rb | 31 +-
lib/docs/scrapers/perl.rb | 6 +
lib/docs/scrapers/phalcon.rb | 5 +
lib/docs/scrapers/phaser.rb | 4 +
lib/docs/scrapers/phoenix.rb | 5 +
lib/docs/scrapers/php.rb | 6 +
lib/docs/scrapers/phpunit.rb | 6 +
lib/docs/scrapers/pony.rb | 27 ++
lib/docs/scrapers/postgresql.rb | 6 +
lib/docs/scrapers/pug.rb | 4 +
lib/docs/scrapers/puppeteer.rb | 5 +
lib/docs/scrapers/pygame.rb | 9 +-
lib/docs/scrapers/python.rb | 13 +-
lib/docs/scrapers/q.rb | 4 +
lib/docs/scrapers/qt.rb | 19 +-
lib/docs/scrapers/ramda.rb | 10 +-
lib/docs/scrapers/rdoc/minitest.rb | 14 +-
lib/docs/scrapers/rdoc/rails.rb | 16 +-
lib/docs/scrapers/rdoc/ruby.rb | 34 ++-
lib/docs/scrapers/react.rb | 5 +
lib/docs/scrapers/react_native.rb | 5 +
lib/docs/scrapers/redis.rb | 6 +
lib/docs/scrapers/redux.rb | 4 +
lib/docs/scrapers/relay.rb | 5 +
lib/docs/scrapers/requirejs.rb | 4 +
lib/docs/scrapers/rethinkdb.rb | 4 +
lib/docs/scrapers/rust.rb | 6 +
lib/docs/scrapers/salt_stack.rb | 36 +++
lib/docs/scrapers/sass.rb | 4 +
lib/docs/scrapers/scala.rb | 61 ++++
lib/docs/scrapers/scikit_image.rb | 5 +
lib/docs/scrapers/scikit_learn.rb | 4 +
lib/docs/scrapers/sinon.rb | 5 +
lib/docs/scrapers/socketio.rb | 4 +
lib/docs/scrapers/sqlite.rb | 5 +
lib/docs/scrapers/statsmodels.rb | 4 +
lib/docs/scrapers/support_tables.rb | 6 +
lib/docs/scrapers/symfony.rb | 4 +
lib/docs/scrapers/tcl_tk.rb | 5 +
lib/docs/scrapers/tensorflow.rb | 4 +
lib/docs/scrapers/terraform.rb | 5 +
lib/docs/scrapers/twig.rb | 5 +
lib/docs/scrapers/typescript.rb | 4 +
lib/docs/scrapers/underscore.rb | 5 +
lib/docs/scrapers/vagrant.rb | 5 +
lib/docs/scrapers/vue.rb | 4 +
lib/docs/scrapers/vue_router.rb | 29 ++
lib/docs/scrapers/vuex.rb | 27 ++
lib/docs/scrapers/vulkan.rb | 5 +
lib/docs/scrapers/webpack.rb | 4 +
lib/docs/scrapers/wordpress.rb | 44 +++
lib/docs/scrapers/yarn.rb | 4 +
lib/docs/scrapers/yii.rb | 4 +
lib/tasks/assets.thor | 3 +
lib/tasks/docs.thor | 15 +-
lib/tasks/sprites.thor | 213 ++++++++++++++
lib/tasks/updates.thor | 315 +++++++++++++++++++++
public/docs/docs.json | 1 -
public/favicon.pxm | Bin 0 -> 159961 bytes
public/favicon 2x pxm | Bin 0 -> 190253 bytes
public/icons/docs-1.pxm | Bin 3352748 -> 0 bytes
public/icons/docs-1 2x pxm | Bin 3669552 -> 0 bytes
public/icons/docs-2.pxm | Bin 1411876 -> 0 bytes
public/icons/docs-2 2x pxm | Bin 1523904 -> 0 bytes
public/icons/docs/bluebird/16 2x png | Bin 1018 -> 2273 bytes
public/icons/docs/composer/16.png | Bin 0 -> 1464 bytes
public/icons/docs/composer/16 2x png | Bin 0 -> 3607 bytes
public/icons/docs/composer/SOURCE | 1 +
public/icons/docs/css/CSS3.sketch/Data | Bin 0 -> 69815 bytes
.../docs/css/CSS3.sketch/QuickLook/Preview.png | Bin 0 -> 19757 bytes
.../docs/css/CSS3.sketch/QuickLook/Thumbnail.png | Bin 0 -> 82586 bytes
public/icons/docs/css/CSS3.sketch/fonts | 0
public/icons/docs/css/CSS3.sketch/version | 1 +
public/icons/docs/cypress/16.png | Bin 0 -> 1183 bytes
public/icons/docs/cypress/16 2x png | Bin 0 -> 1858 bytes
public/icons/docs/cypress/SOURCE | 1 +
public/icons/docs/dom/DOM.sketch/Data | Bin 0 -> 71791 bytes
.../docs/dom/DOM.sketch/QuickLook/Preview.png | Bin 0 -> 20363 bytes
.../docs/dom/DOM.sketch/QuickLook/Thumbnail.png | Bin 0 -> 95153 bytes
public/icons/docs/dom/DOM.sketch/fonts | 0
public/icons/docs/dom/DOM.sketch/version | 1 +
.../icons/docs/dom_events/DOM_events.sketch/Data | Bin 0 -> 96701 bytes
.../DOM_events.sketch/QuickLook/Preview.png | Bin 0 -> 19452 bytes
.../DOM_events.sketch/QuickLook/Thumbnail.png | Bin 0 -> 88324 bytes
.../icons/docs/dom_events/DOM_events.sketch/fonts | 0
.../docs/dom_events/DOM_events.sketch/version | 1 +
public/icons/docs/express/16.pxm | Bin 0 -> 216121 bytes
public/icons/docs/express/16 2x pxm | Bin 0 -> 216822 bytes
public/icons/docs/godot/16.png | Bin 751 -> 642 bytes
public/icons/docs/godot/16 2x png | Bin 1585 -> 1415 bytes
public/icons/docs/html/HTML5.sketch/Data | Bin 0 -> 77064 bytes
.../docs/html/HTML5.sketch/QuickLook/Preview.png | Bin 0 -> 19675 bytes
.../docs/html/HTML5.sketch/QuickLook/Thumbnail.png | Bin 0 -> 84121 bytes
public/icons/docs/html/HTML5.sketch/fonts | 0
public/icons/docs/html/HTML5.sketch/version | 1 +
public/icons/docs/http/16.pxm | Bin 0 -> 105216 bytes
public/icons/docs/http/16 2x pxm | Bin 0 -> 127095 bytes
public/icons/docs/javascript/16.pxm | Bin 0 -> 24870 bytes
public/icons/docs/javascript/16 2x pxm | Bin 0 -> 218914 bytes
public/icons/docs/knockout/16 2x pxm | Bin 0 -> 229176 bytes
public/icons/docs/less/less.pxm | Bin 0 -> 85177 bytes
public/icons/docs/moment/moment.sketch/Data | Bin 0 -> 13875 bytes
.../moment/moment.sketch/QuickLook/Preview.png | Bin 0 -> 378 bytes
.../moment/moment.sketch/QuickLook/Thumbnail.png | Bin 0 -> 49727 bytes
public/icons/docs/moment/moment.sketch/fonts | 0
public/icons/docs/moment/moment.sketch/metadata | 14 +
public/icons/docs/moment/moment.sketch/version | 1 +
public/icons/docs/nokogiri/icon.pxm | Bin 0 -> 103911 bytes
public/icons/docs/php/16 2x pxm | Bin 0 -> 172499 bytes
public/icons/docs/pony/16.png | Bin 0 -> 1360 bytes
public/icons/docs/pony/16 2x png | Bin 0 -> 1979 bytes
public/icons/docs/pony/SOURCE | 1 +
public/icons/docs/rails/rails.pxm | Bin 0 -> 333016 bytes
public/icons/docs/saltstack/16.png | Bin 0 -> 726 bytes
public/icons/docs/saltstack/16 2x png | Bin 0 -> 1432 bytes
public/icons/docs/saltstack/SOURCE | 1 +
public/icons/docs/sass/sass.pxm | Bin 0 -> 111000 bytes
public/icons/docs/scala/16.png | Bin 0 -> 944 bytes
public/icons/docs/scala/16 2x png | Bin 0 -> 1843 bytes
public/icons/docs/support_tables/16.pxm | Bin 0 -> 101020 bytes
public/icons/docs/support_tables/16 2x pxm | Bin 0 -> 118881 bytes
public/icons/docs/vue_router/16.png | Bin 0 -> 534 bytes
public/icons/docs/vue_router/16 2x png | Bin 0 -> 1244 bytes
public/icons/docs/vue_router/SOURCE | 1 +
public/icons/docs/vuex/16.png | Bin 0 -> 534 bytes
public/icons/docs/vuex/16 2x png | Bin 0 -> 1244 bytes
public/icons/docs/vuex/SOURCE | 1 +
public/icons/docs/wordpress/16.png | Bin 0 -> 1513 bytes
public/icons/docs/wordpress/16 2x png | Bin 0 -> 1703 bytes
public/icons/docs/wordpress/SOURCE | 1 +
public/icons/docs/xpath/XPath.sketch/Data | Bin 0 -> 22373 bytes
.../docs/xpath/XPath.sketch/QuickLook/Preview.png | Bin 0 -> 26202 bytes
.../xpath/XPath.sketch/QuickLook/Thumbnail.png | Bin 0 -> 109471 bytes
public/icons/docs/xpath/XPath.sketch/metadata | 18 ++
public/icons/docs/xpath/XPath.sketch/version | 1 +
public/images/apple-icon.pxm | Bin 0 -> 396318 bytes
public/images/fluid-icon.pxm | Bin 0 -> 522097 bytes
public/images/icon.pxm | Bin 0 -> 214911 bytes
public/images/webapp-icon-192.png | Bin 0 -> 32187 bytes
public/images/webapp-icon-small.pxm | Bin 0 -> 143934 bytes
public/manifest.json | 6 +
test/app_test.rb | 81 ------
test/lib/docs/core/scrapers/file_scraper_test.rb | 4 +-
views/app.erb | 14 +-
views/index.erb | 5 +-
views/manifest.erb | 14 -
views/other.erb | 5 +-
views/service-worker.js.erb | 93 ++++++
views/unsupported.erb | 12 +-
353 files changed, 4207 insertions(+), 810 deletions(-)
---
diff --cc assets/stylesheets/application.css.scss
index bcd8a7f2,4374e60c..b16aed59
--- a/assets/stylesheets/application.css.scss
+++ b/assets/stylesheets/application.css.scss
@@@ -94,7 -94,7 +94,8 @@@
'pages/rfc',
'pages/rubydoc',
'pages/rust',
+ 'pages/rxjs',
+ 'pages/scala',
'pages/sinon',
'pages/socketio',
'pages/sphinx',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
