Merge branch 'develop' into feature/naas

WebcamViewer move
wip
2020-05-11 22:03:54 -05:00 · 2020-05-11 22:03:45 -05:00 · 2020-05-11 14:23:34 -05:00
3 changed files with 8 additions and 2 deletions
--- a/db/up/find_sessions_2020.sql
+++ b/db/up/find_sessions_2020.sql
@ -35,4 +35,10 @@ CREATE TABLE arses (
 ------
-ALTER TABLE generic_state ADD COLUMN top_message VARCHAR(100000);
+ALTER TABLE generic_state ADD COLUMN top_message VARCHAR(100000);
 ------
 CREATE INDEX index_user_id_on_claimed_rec ON claimed_recordings USING btree (user_id);
 ALTER TABLE arses ADD COLUMN provider varchar(20) NOT NULL DEFAULT 'gcp';
 ALTER TABLE arses ADD COLUMN provider_instance_id varchar(200) NOT NULL DEFAULT 'unknown';
--- a/ruby/lib/jam_ruby/models/ars.rb
+++ b/ruby/lib/jam_ruby/models/ars.rb
@ -2,7 +2,7 @@
 module JamRuby
  class Ars < ActiveRecord::Base
-    attr_accessible :active, :name, :id_int, :ip,  as: :admin
+    attr_accessible :active, :name, :id_int, :ip, :provider, :provider_instance_id,  as: :admin
    self.table_name = "arses"
    @@log = Logging.logger[Ars]
--- a/web/app/assets/javascripts/react-components/stores/WebcamViewer.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/stores/WebcamViewer.js.jsx.coffee
Author	SHA1	Message	Date
Seth Call	68e4a4aa4d	Merge branch 'develop' into feature/naas	2020-05-11 22:03:54 -05:00
Seth Call	6915cd9748	WebcamViewer move	2020-05-11 22:03:45 -05:00
Seth Call	634172f5cc	wip	2020-05-11 14:23:34 -05:00