diff --git a/app/controllers/admin/user_feedbacks_controller.rb b/app/controllers/admin/user_feedbacks_controller.rb index dfb1cd33..b74b7b90 100644 --- a/app/controllers/admin/user_feedbacks_controller.rb +++ b/app/controllers/admin/user_feedbacks_controller.rb @@ -2,7 +2,7 @@ module Admin class UserFeedbacksController < Admin::ApplicationController def index - @user_feedbacks = UserFeedback.all(page: params[:page], per_page: params[:per_page].presence || 40 ) + @user_feedbacks = UserFeedback.all(page: params[:page], per_page: params[:per_page].presence || 40, descending: true) end def show diff --git a/drb_counter/drb_counter.rb b/drb_counter/drb_counter.rb index 60943b2c..17c71d27 100644 --- a/drb_counter/drb_counter.rb +++ b/drb_counter/drb_counter.rb @@ -70,8 +70,9 @@ class InMemoryQCounter puts "Couch settings path: #{couch_settings_path}" puts "Environment: #{environment.inspect}" #couch_settings = YAML.load_file(couch_settings_path)[environment] - couch_settings = YAML.safe_load(ERB.new(File.read(couch_settings_path)).result, [Symbol], [], ['default'])[environment] - database = couch_settings['database'].sub 'localhost', 'host.docker.internal' + couch_settings = YAML.safe_load(ERB.new(File.read(couch_settings_path)).result, permitted_classes: [Symbol])[environment] + database = couch_settings['database'] + database = database.sub 'localhost', 'host.docker.internal' unless environment == 'development' #database = couch_settings['database'] #database = couch_settings['database'].sub 'localhost', '172.17.0.1' db = CouchRest.database(database) # for debug: db = CouchPotato.database.couchrest_database