merge master

app/controllers/exercises_controller.rb

@@ -9,7 +9,6 @@ class ExercisesController < ApplicationController
   before_action :set_exercise, only: MEMBER_ACTIONS + [:clone, :implement, :run, :statistics, :submit, :reload]
   before_action :set_external_user, only: [:statistics]
   before_action :set_file_types, only: [:create, :edit, :new, :update]
-  before_action :set_teams, only: [:create, :edit, :new, :update]
 
   skip_before_filter :verify_authenticity_token, only: [:import_proforma_xml]
   skip_after_action :verify_authorized, only: [:import_proforma_xml]
@@ -119,7 +118,7 @@ class ExercisesController < ApplicationController
   private :user_by_code_harbor_token
 
   def exercise_params
-    params[:exercise].permit(:description, :execution_environment_id, :file_id, :instructions, :public, :hide_file_tree, :allow_file_creation, :team_id, :title, files_attributes: file_attributes).merge(user_id: current_user.id, user_type: current_user.class.name)
+    params[:exercise].permit(:description, :execution_environment_id, :file_id, :instructions, :public, :hide_file_tree, :allow_file_creation, :title, files_attributes: file_attributes).merge(user_id: current_user.id, user_type: current_user.class.name)
   end
   private :exercise_params
 
@@ -195,11 +194,6 @@ class ExercisesController < ApplicationController
   end
   private :set_file_types
 
-  def set_teams
-    @teams = Team.all.order(:name)
-  end
-  private :set_teams
-
   def show
   end
 

app/controllers/teams_controller.rb

@@ -1,51 +0,0 @@
-class TeamsController < ApplicationController
-  include CommonBehavior
-
-  before_action :set_team, only: MEMBER_ACTIONS
-
-  def authorize!
-    authorize(@team || @teams)
-  end
-  private :authorize!
-
-  def create
-    @team = Team.new(team_params)
-    authorize!
-    create_and_respond(object: @team)
-  end
-
-  def destroy
-    destroy_and_respond(object: @team)
-  end
-
-  def edit
-  end
-
-  def index
-    @teams = Team.all.includes(:internal_users).order(:name).paginate(page: params[:page])
-    authorize!
-  end
-
-  def new
-    @team = Team.new
-    authorize!
-  end
-
-  def set_team
-    @team = Team.find(params[:id])
-    authorize!
-  end
-  private :set_team
-
-  def show
-  end
-
-  def team_params
-    params[:team].permit(:name, internal_user_ids: [])
-  end
-  private :team_params
-
-  def update
-    update_and_respond(object: @team, params: team_params)
-  end
-end