Bring mastofe up to date

Commit https://git.pleroma.social/tyge/mastofe/commit/5edce2030238293463c041537da4aaeea5cb3875

summary:

```
*   5edce203 - (4 minutes ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette (HEAD -> master, origin/master, origin/HEAD)
|\
| * 2c51bc0c - (4 hours ago)  Add missing rejection handling for Promises (#7008) - unarist (upstream/master)
| * e7a17167 - (5 hours ago) Implement the ability for an Administrator or Moderator to remove an account avatar (#6998) - Emelia Smith
| * 4fd71acc - (5 hours ago) Fix issues with sending direct messages from user profile (#6999) - Emelia Smith
| * 3f51c6ef - (5 hours ago) Weblate translations (2018-04-02) (#7007) - Yamagishi Kazutoshi
| * b04f73ce - (6 hours ago) Russian language updated (#7005) - Evgeny Petrov
| * 24611d8d - (6 hours ago) i18n: update zh-HK translation (#7004) - luzi82
| * f890d2a7 - (16 hours ago) Support all ActivityPub actor types (#6997) - Eugen Rochko
| * 33513753 - (16 hours ago) Fix unpermitted parameters warning when generating pagination URLs (#6995) - Eugen Rochko
| * 123a343d - (19 hours ago) [WIP] Enable custom emoji on account pages and in the sidebar (#6124) - David Underwood
| * f464f98f - (19 hours ago) Update Ruby to version 2.4.4 (#6964) - Yamagishi Kazutoshi
| * 6a895e1a - (20 hours ago) Fix: Prevent submission using same logic as submit button disabling. (#6993) - Emelia Smith
* | 011eda08 - (7 minutes ago) Properly cache requests using service workers - Morgan Bazalgette
* | 8dd77f17 - (5 hours ago) Fix build - Morgan Bazalgette
* | 99373236 - (19 hours ago) Add build status - Morgan Bazalgette
* | b448a3a5 - (19 hours ago) Update README - Morgan Bazalgette
* | 68fd7ee6 - (20 hours ago) Fix statuses embedded in like/boost notifs being white - Morgan Bazalgette
* | 7a9212df - (21 hours ago) Temporary workaround to only show related statuses - Morgan Bazalgette
* |   00bd10fa - (26 hours ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette
|\ \
| |/
| * 993ce0e5 - (28 hours ago) improve zh-HK localization by referring zh-TW and zh-CN (#6988) - luzi82
* |   05832497 - (30 hours ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette
 \ \
  |/
  * 929f58f1 - (32 hours ago) i18n: Update Polish translation (#6985) - Marcin Mikołajczak
```

1 files changed, 1 insertions, 1 deletions

diff --git a/priv/static/packs/features/getting_started.js b/priv/static/packs/features/getting_started.js
index 3057db7ff..61d3be6ab 100644
--- a/priv/static/packs/features/getting_started.js
+++ b/priv/static/packs/features/getting_started.js
@@ -1,2 +1,2 @@
-webpackJsonp([21],{150:function(e,t,n){"use strict";n.d(t,"a",function(){return h});var i=n(2),o=n.n(i),a=n(1),s=n.n(a),r=n(3),u=n.n(r),l=n(4),c=n.n(l),d=n(0),f=n.n(d),g=n(10),m=n.n(g),h=function(e){function t(){var n,i,o;s()(this,t);for(var a=arguments.length,r=Array(a),l=0;l<a;l++)r[l]=arguments[l];return n=i=u()(this,e.call.apply(e,[this].concat(r))),i.handleClick=function(){i.props.onClick()},o=n,u()(i,o)}return c()(t,e),t.prototype.render=function(){var e=this.props,t=e.icon,n=e.type,i=e.active,a=e.columnHeaderId,s="";return t&&(s=o()("i",{className:"fa fa-fw fa-"+t+" column-header__icon"})),o()("h1",{className:m()("column-header",{active:i}),id:a||null},void 0,o()("button",{onClick:this.handleClick},void 0,s,n))},t}(f.a.PureComponent)},283:function(e,t,n){"use strict";n.d(t,"a",function(){return v});var i=n(2),o=n.n(i),a=n(1),s=n.n(a),r=n(3),u=n.n(r),l=n(4),c=n.n(l),d=n(34),f=n.n(d),g=n(0),m=n.n(g),h=n(150),b=n(90),p=n(35),v=function(e){function t(){var n,i,o;s()(this,t);for(var a=arguments.length,r=Array(a),l=0;l<a;l++)r[l]=arguments[l];return n=i=u()(this,e.call.apply(e,[this].concat(r))),i.handleHeaderClick=function(){var e=i.node.querySelector(".scrollable");e&&(i._interruptScrollAnimation=Object(b.b)(e))},i.handleScroll=f()(function(){void 0!==i._interruptScrollAnimation&&i._interruptScrollAnimation()},200),i.setRef=function(e){i.node=e},o=n,u()(i,o)}return c()(t,e),t.prototype.scrollTop=function(){var e=this.node.querySelector(".scrollable");e&&(this._interruptScrollAnimation=Object(b.b)(e))},t.prototype.render=function(){var e=this.props,t=e.heading,n=e.icon,i=e.children,a=e.active,s=e.hideHeadingOnMobile,r=t&&(!s||s&&!Object(p.b)(window.innerWidth)),u=r&&t.replace(/ /g,"-"),l=r&&o()(h.a,{icon:n,active:a,type:t,onClick:this.handleHeaderClick,columnHeaderId:u});return m.a.createElement("div",{ref:this.setRef,role:"region","aria-labelledby":u,className:"column",onScroll:this.handleScroll},l,i)},t}(m.a.PureComponent)},811:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),n.d(t,"default",function(){return j});var i,o,a,s,r=n(2),u=n.n(r),l=n(1),c=n.n(l),d=n(3),f=n.n(d),g=n(4),m=n.n(g),h=n(0),b=(n.n(h),n(283)),p=n(965),v=n(966),_=n(6),M=n(9),y=n(5),k=n.n(y),q=n(13),w=n.n(q),N=n(12),A=n.n(N),O=n(11),x=n(22),C=n(8),F=(n.n(C),Object(_.f)({heading:{id:"getting_started.heading",defaultMessage:"Getting started"},home_timeline:{id:"tabs_bar.home",defaultMessage:"Home"},notifications:{id:"tabs_bar.notifications",defaultMessage:"Notifications"},public_timeline:{id:"navigation_bar.public_timeline",defaultMessage:"Federated timeline"},navigation_subheading:{id:"column_subheading.navigation",defaultMessage:"Navigation"},settings_subheading:{id:"column_subheading.settings",defaultMessage:"Settings"},community_timeline:{id:"navigation_bar.community_timeline",defaultMessage:"Local timeline"},preferences:{id:"navigation_bar.preferences",defaultMessage:"Preferences"},follow_requests:{id:"navigation_bar.follow_requests",defaultMessage:"Follow requests"},sign_out:{id:"navigation_bar.logout",defaultMessage:"Logout"},favourites:{id:"navigation_bar.favourites",defaultMessage:"Favourites"},blocks:{id:"navigation_bar.blocks",defaultMessage:"Blocked users"},keyboard_shortcuts:{id:"navigation_bar.keyboard_shortcuts",defaultMessage:"Keyboard shortcuts"}})),I=function(e){return{myAccount:e.getIn(["accounts",O.g]),columns:e.getIn(["settings","columns"]),unreadFollowRequests:e.getIn(["user_lists","follow_requests","items"],Object(C.List)()).size,unreadNotifications:e.getIn(["notifications","unread"])}},R=function(e){return{fetchFollowRequests:function(){return e(Object(x.v)())}}},S=function(e,t){return 0===e?void 0:t&&e>=t?t+"+":e},j=(i=Object(M.connect)(I,R))(o=Object(_.g)((s=a=function(e){function t(){return c()(this,t),f()(this,e.apply(this,arguments))}return m()(t,e),t.prototype.componentDidMount=function(){var e=this.props,t=e.myAccount,n=e.fetchFollowRequests;t.get("locked")&&n()},t.prototype.render=function(){var e=this.props,t=e.intl,n=e.myAccount,i=e.columns,o=e.multiColumn,a=e.unreadFollowRequests,s=e.unreadNotifications,r=[];return o&&(i.find(function(e){return"HOME"===e.get("id")})||r.push(u()(p.a,{icon:"home",text:t.formatMessage(F.home_timeline),to:"/timelines/home"},"0")),i.find(function(e){return"NOTIFICATIONS"===e.get("id")})||r.push(u()(p.a,{icon:"bell",text:t.formatMessage(F.notifications),badge:S(s),to:"/notifications"},"1")),i.find(function(e){return"COMMUNITY"===e.get("id")})||r.push(u()(p.a,{icon:"users",text:t.formatMessage(F.community_timeline),to:"/timelines/public/local"},"2")),i.find(function(e){return"PUBLIC"===e.get("id")})||r.push(u()(p.a,{icon:"globe",text:t.formatMessage(F.public_timeline),to:"/timelines/public"},"3"))),r.push(u()(p.a,{icon:"star",text:t.formatMessage(F.favourites),to:"/favourites"},"4")),n.get("locked")&&r.push(u()(p.a,{icon:"users",text:t.formatMessage(F.follow_requests),badge:S(a,40),to:"/follow_requests"},"6")),o&&r.push(u()(p.a,{icon:"question",text:t.formatMessage(F.keyboard_shortcuts),to:"/keyboard-shortcuts"},"7")),u()(b.a,{icon:"asterisk",heading:t.formatMessage(F.heading),hideHeadingOnMobile:!0},void 0,u()("div",{className:"getting-started__wrapper"},void 0,u()(v.a,{text:t.formatMessage(F.navigation_subheading)}),r,u()(v.a,{text:t.formatMessage(F.settings_subheading)}),u()(p.a,{icon:"ban",text:t.formatMessage(F.blocks),to:"/blocks"}),u()(p.a,{icon:"cog",text:t.formatMessage(F.preferences),href:"/user-settings"}),u()(p.a,{icon:"sign-out",text:t.formatMessage(F.sign_out),href:"/auth/sign_out",method:"delete"})),u()("div",{className:"static-content getting-started"},void 0,u()("p",{},void 0,u()("a",{href:"https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/FAQ.md",rel:"noopener",target:"_blank"},void 0,u()(_.b,{id:"getting_started.faq",defaultMessage:"FAQ"}))," • ",u()("a",{href:"https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/User-guide.md",rel:"noopener",target:"_blank"},void 0,u()(_.b,{id:"getting_started.userguide",defaultMessage:"User Guide"}))," • ",u()("a",{href:"https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md",rel:"noopener",target:"_blank"},void 0,u()(_.b,{id:"getting_started.appsshort",defaultMessage:"Apps"}))," • ",u()("a",{href:"https://pleroma.social"},void 0,u()(_.b,{id:"getting_started.pleroma",defaultMessage:"Pleroma"})))))},t}(A.a),a.propTypes={intl:k.a.object.isRequired,myAccount:w.a.map.isRequired,columns:w.a.list,multiColumn:k.a.bool,fetchFollowRequests:k.a.func.isRequired,unreadFollowRequests:k.a.number,unreadNotifications:k.a.number},o=s))||o)||o},965:function(e,t,n){"use strict";var i=n(2),o=n.n(i),a=n(0),s=(n.n(a),n(44)),r=function(e){var t=e.icon,n=e.text,i=e.to,a=e.href,r=e.method,u=e.badge,l=void 0!==u?o()("span",{className:"column-link__badge"},void 0,u):null;return a?o()("a",{href:a,className:"column-link","data-method":r},void 0,o()("i",{className:"fa fa-fw fa-"+t+" column-link__icon"}),n,l):o()(s.b,{to:i,className:"column-link"},void 0,o()("i",{className:"fa fa-fw fa-"+t+" column-link__icon"}),n,l)};t.a=r},966:function(e,t,n){"use strict";var i=n(2),o=n.n(i),a=n(0),s=(n.n(a),function(e){var t=e.text;return o()("div",{className:"column-subheading"},void 0,t)});t.a=s}});
+webpackJsonp([21],{150:function(e,t,n){"use strict";n.d(t,"a",function(){return h});var i=n(2),o=n.n(i),a=n(1),s=n.n(a),r=n(3),u=n.n(r),l=n(4),c=n.n(l),d=n(0),f=n.n(d),g=n(10),m=n.n(g),h=function(e){function t(){var n,i,o;s()(this,t);for(var a=arguments.length,r=Array(a),l=0;l<a;l++)r[l]=arguments[l];return n=i=u()(this,e.call.apply(e,[this].concat(r))),i.handleClick=function(){i.props.onClick()},o=n,u()(i,o)}return c()(t,e),t.prototype.render=function(){var e=this.props,t=e.icon,n=e.type,i=e.active,a=e.columnHeaderId,s="";return t&&(s=o()("i",{className:"fa fa-fw fa-"+t+" column-header__icon"})),o()("h1",{className:m()("column-header",{active:i}),id:a||null},void 0,o()("button",{onClick:this.handleClick},void 0,s,n))},t}(f.a.PureComponent)},283:function(e,t,n){"use strict";n.d(t,"a",function(){return v});var i=n(2),o=n.n(i),a=n(1),s=n.n(a),r=n(3),u=n.n(r),l=n(4),c=n.n(l),d=n(34),f=n.n(d),g=n(0),m=n.n(g),h=n(150),b=n(91),p=n(35),v=function(e){function t(){var n,i,o;s()(this,t);for(var a=arguments.length,r=Array(a),l=0;l<a;l++)r[l]=arguments[l];return n=i=u()(this,e.call.apply(e,[this].concat(r))),i.handleHeaderClick=function(){var e=i.node.querySelector(".scrollable");e&&(i._interruptScrollAnimation=Object(b.b)(e))},i.handleScroll=f()(function(){void 0!==i._interruptScrollAnimation&&i._interruptScrollAnimation()},200),i.setRef=function(e){i.node=e},o=n,u()(i,o)}return c()(t,e),t.prototype.scrollTop=function(){var e=this.node.querySelector(".scrollable");e&&(this._interruptScrollAnimation=Object(b.b)(e))},t.prototype.render=function(){var e=this.props,t=e.heading,n=e.icon,i=e.children,a=e.active,s=e.hideHeadingOnMobile,r=t&&(!s||s&&!Object(p.b)(window.innerWidth)),u=r&&t.replace(/ /g,"-"),l=r&&o()(h.a,{icon:n,active:a,type:t,onClick:this.handleHeaderClick,columnHeaderId:u});return m.a.createElement("div",{ref:this.setRef,role:"region","aria-labelledby":u,className:"column",onScroll:this.handleScroll},l,i)},t}(m.a.PureComponent)},811:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),n.d(t,"default",function(){return j});var i,o,a,s,r=n(2),u=n.n(r),l=n(1),c=n.n(l),d=n(3),f=n.n(d),g=n(4),m=n.n(g),h=n(0),b=(n.n(h),n(283)),p=n(965),v=n(966),_=n(6),M=n(9),y=n(5),k=n.n(y),q=n(13),w=n.n(q),N=n(12),A=n.n(N),O=n(11),x=n(22),C=n(8),F=(n.n(C),Object(_.f)({heading:{id:"getting_started.heading",defaultMessage:"Getting started"},home_timeline:{id:"tabs_bar.home",defaultMessage:"Home"},notifications:{id:"tabs_bar.notifications",defaultMessage:"Notifications"},public_timeline:{id:"navigation_bar.public_timeline",defaultMessage:"Federated timeline"},navigation_subheading:{id:"column_subheading.navigation",defaultMessage:"Navigation"},settings_subheading:{id:"column_subheading.settings",defaultMessage:"Settings"},community_timeline:{id:"navigation_bar.community_timeline",defaultMessage:"Local timeline"},preferences:{id:"navigation_bar.preferences",defaultMessage:"Preferences"},follow_requests:{id:"navigation_bar.follow_requests",defaultMessage:"Follow requests"},sign_out:{id:"navigation_bar.logout",defaultMessage:"Logout"},favourites:{id:"navigation_bar.favourites",defaultMessage:"Favourites"},blocks:{id:"navigation_bar.blocks",defaultMessage:"Blocked users"},keyboard_shortcuts:{id:"navigation_bar.keyboard_shortcuts",defaultMessage:"Keyboard shortcuts"}})),I=function(e){return{myAccount:e.getIn(["accounts",O.g]),columns:e.getIn(["settings","columns"]),unreadFollowRequests:e.getIn(["user_lists","follow_requests","items"],Object(C.List)()).size,unreadNotifications:e.getIn(["notifications","unread"])}},R=function(e){return{fetchFollowRequests:function(){return e(Object(x.v)())}}},S=function(e,t){return 0===e?void 0:t&&e>=t?t+"+":e},j=(i=Object(M.connect)(I,R))(o=Object(_.g)((s=a=function(e){function t(){return c()(this,t),f()(this,e.apply(this,arguments))}return m()(t,e),t.prototype.componentDidMount=function(){var e=this.props,t=e.myAccount,n=e.fetchFollowRequests;t.get("locked")&&n()},t.prototype.render=function(){var e=this.props,t=e.intl,n=e.myAccount,i=e.columns,o=e.multiColumn,a=e.unreadFollowRequests,s=e.unreadNotifications,r=[];return o&&(i.find(function(e){return"HOME"===e.get("id")})||r.push(u()(p.a,{icon:"home",text:t.formatMessage(F.home_timeline),to:"/timelines/home"},"0")),i.find(function(e){return"NOTIFICATIONS"===e.get("id")})||r.push(u()(p.a,{icon:"bell",text:t.formatMessage(F.notifications),badge:S(s),to:"/notifications"},"1")),i.find(function(e){return"COMMUNITY"===e.get("id")})||r.push(u()(p.a,{icon:"users",text:t.formatMessage(F.community_timeline),to:"/timelines/public/local"},"2")),i.find(function(e){return"PUBLIC"===e.get("id")})||r.push(u()(p.a,{icon:"globe",text:t.formatMessage(F.public_timeline),to:"/timelines/public"},"3"))),r.push(u()(p.a,{icon:"star",text:t.formatMessage(F.favourites),to:"/favourites"},"4")),n.get("locked")&&r.push(u()(p.a,{icon:"users",text:t.formatMessage(F.follow_requests),badge:S(a,40),to:"/follow_requests"},"6")),o&&r.push(u()(p.a,{icon:"question",text:t.formatMessage(F.keyboard_shortcuts),to:"/keyboard-shortcuts"},"7")),u()(b.a,{icon:"asterisk",heading:t.formatMessage(F.heading),hideHeadingOnMobile:!0},void 0,u()("div",{className:"getting-started__wrapper"},void 0,u()(v.a,{text:t.formatMessage(F.navigation_subheading)}),r,u()(v.a,{text:t.formatMessage(F.settings_subheading)}),u()(p.a,{icon:"ban",text:t.formatMessage(F.blocks),to:"/blocks"}),u()(p.a,{icon:"cog",text:t.formatMessage(F.preferences),href:"/user-settings"}),u()(p.a,{icon:"sign-out",text:t.formatMessage(F.sign_out),href:"/auth/sign_out",method:"delete"})),u()("div",{className:"static-content getting-started"},void 0,u()("p",{},void 0,u()("a",{href:"https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/FAQ.md",rel:"noopener",target:"_blank"},void 0,u()(_.b,{id:"getting_started.faq",defaultMessage:"FAQ"}))," • ",u()("a",{href:"https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/User-guide.md",rel:"noopener",target:"_blank"},void 0,u()(_.b,{id:"getting_started.userguide",defaultMessage:"User Guide"}))," • ",u()("a",{href:"https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md",rel:"noopener",target:"_blank"},void 0,u()(_.b,{id:"getting_started.appsshort",defaultMessage:"Apps"}))," • ",u()("a",{href:"https://pleroma.social"},void 0,u()(_.b,{id:"getting_started.pleroma",defaultMessage:"Pleroma"})))))},t}(A.a),a.propTypes={intl:k.a.object.isRequired,myAccount:w.a.map.isRequired,columns:w.a.list,multiColumn:k.a.bool,fetchFollowRequests:k.a.func.isRequired,unreadFollowRequests:k.a.number,unreadNotifications:k.a.number},o=s))||o)||o},965:function(e,t,n){"use strict";var i=n(2),o=n.n(i),a=n(0),s=(n.n(a),n(45)),r=function(e){var t=e.icon,n=e.text,i=e.to,a=e.href,r=e.method,u=e.badge,l=void 0!==u?o()("span",{className:"column-link__badge"},void 0,u):null;return a?o()("a",{href:a,className:"column-link","data-method":r},void 0,o()("i",{className:"fa fa-fw fa-"+t+" column-link__icon"}),n,l):o()(s.b,{to:i,className:"column-link"},void 0,o()("i",{className:"fa fa-fw fa-"+t+" column-link__icon"}),n,l)};t.a=r},966:function(e,t,n){"use strict";var i=n(2),o=n.n(i),a=n(0),s=(n.n(a),function(e){var t=e.text;return o()("div",{className:"column-subheading"},void 0,t)});t.a=s}});
 //# sourceMappingURL=getting_started.js.map
\ No newline at end of file