From 2a697c5d1f1accf5837c0aaf880e480c85ffd2ec Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Thu, 29 Sep 2016 23:41:18 +0200 Subject: [PATCH] Remove inbox.js from precompiled assets closes #7108 --- Changelog.md | 1 + config/application.rb | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 280fe21cd..4ee6a29ab 100644 --- a/Changelog.md +++ b/Changelog.md @@ -14,6 +14,7 @@ Note: Although this is a minor release, the configuration file changed because t * Adopt new Mapbox tile URIs [#7066](https://github.com/diaspora/diaspora/pull/7066) * Refactored post interactions on the single post view [#7089](https://github.com/diaspora/diaspora/pull/7089) * Extract inline JavaScript [#7113](https://github.com/diaspora/diaspora/pull/7113) +* Port conversations inbox to backbone.js [#7108](https://github.com/diaspora/diaspora/pull/7108) ## Bug fixes * Post comments no longer get collapsed when interacting with a post [#7040](https://github.com/diaspora/diaspora/pull/7040) diff --git a/config/application.rb b/config/application.rb index 4f8668eeb..923816011 100644 --- a/config/application.rb +++ b/config/application.rb @@ -68,7 +68,6 @@ module Diaspora config.assets.precompile += %w( contact-list.js ie.js - inbox.js jquery2.js jquery_ujs.js main.js