[nautilus/gnome-3-28: 6/6] Merge branch 'flatpak-add-stable' into 'gnome-3-28'

[Carlos Soriano <csoriano src gnome org>]

commit e256eae68c887a0aaedc2d2494e03bf5c416531d
Merge: d40a91343 423c4bafa
Author: Carlos Soriano <csoriano1618 gmail com>
Date:   Mon Mar 19 09:17:57 2018 +0000

    Merge branch 'flatpak-add-stable' into 'gnome-3-28'
    
    Flatpak: Add stable handling
    
    See merge request GNOME/nautilus!155

 .gitlab-ci.yml                                     | 135 +++++++++++++++------
 ....Nautilus.json => org.gnome.NautilusDevel.json} |  12 +-
 data/meson.build                                   |  75 ++++++++++--
 data/nautilus-search-provider.ini                  |   5 -
 ...xml.in => org.gnome.Nautilus.appdata.xml.in.in} |   2 +-
 ...desktop.in => org.gnome.Nautilus.desktop.in.in} |   2 +-
 data/org.gnome.Nautilus.search-provider.ini.in     |   5 +
 data/org.gnome.Nautilus.service.in                 |   2 +-
 eel/meson.build                                    |   3 +-
 libnautilus-extension/meson.build                  |   1 +
 meson.build                                        |  45 ++++++-
 meson_options.txt                                  |  12 +-
 src/meson.build                                    |   8 +-
 src/nautilus-application.c                         |  16 ++-
 src/nautilus-dbus-manager.c                        |   2 +-
 src/nautilus-file-utilities.h                      |   4 +-
 src/nautilus-preferences-window.c                  |   2 +-
 src/nautilus-shell-search-provider.c               |   2 +-
 src/nautilus-window.c                              |  12 +-
 src/resources/css/Adwaita.css                      | 118 ++++++++++++++++++
 src/resources/ui/nautilus-window.ui                |   1 -
 test/automated/meson.build                         |   2 +-
 22 files changed, 390 insertions(+), 76 deletions(-)
---