Commit 389c6830 authored by Eric Eastwood's avatar Eric Eastwood

Add feature toggle around embeds (disable embeds)

Fix/Closes,

 - gitlab-org/gitter/webapp#1953
 - gitlab-org/gitter/webapp#1399
 - gitlab-org/gitter/webapp#1140

We can also close the following because embeds are being disabled,

 - gitlab-org/gitter/webapp#714
 - gitlab-org/gitter/webapp#573
 - gitlab-org/gitter/webapp#1217
parent 4e7f406e
# 19.15.0 - *upcoming*
# 19.15.0 - 2018-8-8
- ...
- Add feature toggle for embeds and disable by default, https://gitlab.com/gitlab-org/gitter/webapp/merge_requests/1223
Developer facing:
- Move Android embedded chat build to cross-platform Gulp scripts, https://gitlab.com/gitlab-org/gitter/webapp/merge_requests/1218
- Separate Android and iOS builds (restore chat input for Android), https://gitlab.com/gitlab-org/gitter/webapp/merge_requests/1222
- Gitter Android app is now open-source, https://gitlab.com/gitlab-org/gitter/gitter-android-app
- Move Android embedded chat build to cross-platform Gulp scripts, https://gitlab.com/gitlab-org/gitter/webapp/merge_requests/1218
- Separate Android and iOS builds (restore chat input for Android), https://gitlab.com/gitlab-org/gitter/webapp/merge_requests/1222
# 19.14.0 - 2018-8-1
......
"use strict";
var Marionette = require('backbone.marionette');
var context = require('../../utils/context');
var modalRegion = require('../../components/modal-region');
var ChatContainerView = require('../chat/chatContainerView');
......@@ -31,9 +32,14 @@ var ChatLayout = Marionette.LayoutView.extend({
initChatRegion: function(optionsForRegion) {
var monitorUnreadItems = Marionette.getOption(this, "monitorUnreadItems");
const decorators = [issuableDecorator, commitDecorator, mentionDecorator, emojiDecorator];
if (context.hasFeature('embeds-deprecated')) {
decorators.push(embedDecorator);
}
return new ChatContainerView(optionsForRegion({
collection: this.options.chatCollection,
decorators: [issuableDecorator, commitDecorator, mentionDecorator, embedDecorator, emojiDecorator],
decorators,
monitorScrollPane: monitorUnreadItems && this.ui.scroll // Monitor the scroll region for unread items
}));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment