From 1412b39620e6810ddbf184d859d2a8b116570e84 Mon Sep 17 00:00:00 2001 From: Joshua Arts Date: Wed, 11 Jul 2018 10:23:16 -0400 Subject: [PATCH] skip cleanup and minor fixes --- .travis.yml | 1 + README.md | 6 +++--- app/controllers/rooms_controller.rb | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index beb8cfc9..5b188ba2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ before_deploy: - docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASS" deploy: + skip_cleanup: true provider: script script: docker push bigbluebutton/greenlight:master on: diff --git a/README.md b/README.md index e826dfa2..71206ceb 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -![Travis](https://travis-ci.org/bigbluebutton/greenlight.svg?branch=master) - # Greenlight -Greenlight is currently on version 2.0. If you are still running Greenlight 1.0 we suggest [upgrading to 2.0](http://docs.bigbluebutton.org/install/greenlight-v2.html#upgrading-from-greenlight-10). +![Travis CI](https://travis-ci.org/bigbluebutton/greenlight.svg?branch=master) + +> Greenlight is currently on version 2.0. If you are still running Greenlight 1.0 we suggest [upgrading to 2.0](http://docs.bigbluebutton.org/install/greenlight-v2.html#upgrading-from-greenlight-10). Greenlight is a simple front-end interface for your BigBlueButton server. At it's heart, Greenlight provides a minimalistic web-based application that allows users to: diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb index 57569b3a..525f5c77 100644 --- a/app/controllers/rooms_controller.rb +++ b/app/controllers/rooms_controller.rb @@ -65,7 +65,6 @@ class RoomsController < ApplicationController # DELETE /:room_uid def destroy - p @room # Don't delete the users home room. @room.destroy if @room.owned_by?(current_user) && @room != current_user.main_room