diff --git a/Capfile b/Capfile index 8bc169d9e..532cfeef5 100644 --- a/Capfile +++ b/Capfile @@ -3,8 +3,10 @@ require "capistrano/setup" # Include default deployment tasks require "capistrano/deploy" + require "capistrano/scm/git" install_plugin Capistrano::SCM::Git + require "capistrano/scm/git-with-submodules" install_plugin Capistrano::SCM::Git::WithSubmodules diff --git a/app/assets/javascripts/app/controllers/footer.js b/app/assets/javascripts/app/controllers/footer.js index 0f71564cd..31165dc25 100644 --- a/app/assets/javascripts/app/controllers/footer.js +++ b/app/assets/javascripts/app/controllers/footer.js @@ -107,10 +107,6 @@ angular.module('app') modelManager.addItemSyncObserver("room-bar", "SN|Component", (allItems, validItems, deletedItems, source) => { var incomingRooms = allItems.filter((candidate) => {return candidate.area == "rooms"}); this.rooms = _.uniq(this.rooms.concat(incomingRooms)).filter((candidate) => {return !candidate.deleted}); - - for(var room of this.rooms) { - room.hosted_url = "http://localhost:8080"; - } }); componentManager.registerHandler({identifier: "roomBar", areas: ["rooms", "modal"], activationHandler: (component) => {