Merge branch 'master' of http://github.com/LukeShu/leaguer

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
	config/routes.rb

10 files changed, 0 insertions, 524 deletions

diff --git a/app/controllers/alerts_controller.rb b/app/controllers/alerts_controller.rb
deleted file mode 100644
index 873e9b7..0000000
--- a/app/controllers/alerts_controller.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-class AlertsController < ApplicationController
-  before_action :set_alert, only: [:show, :edit, :update, :destroy]
-
-  # GET /alerts
-  # GET /alerts.json
-  def index
-    @alerts = Alert.all
-  end
-
-  # GET /alerts/1
-  # GET /alerts/1.json
-  def show
-  end
-
-  # GET /alerts/new
-  def new
-    @alert = Alert.new
-  end
-
-  # GET /alerts/1/edit
-  def edit
-  end
-
-  # POST /alerts
-  # POST /alerts.json
-  def create
-    @alert = Alert.new(alert_params)
-
-    respond_to do |format|
-      if @alert.save
-        format.html { redirect_to @alert, notice: 'Alert was successfully created.' }
-        format.json { render action: 'show', status: :created, location: @alert }
-      else
-        format.html { render action: 'new' }
-        format.json { render json: @alert.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PATCH/PUT /alerts/1
-  # PATCH/PUT /alerts/1.json
-  def update
-    respond_to do |format|
-      if @alert.update(alert_params)
-        format.html { redirect_to @alert, notice: 'Alert was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: 'edit' }
-        format.json { render json: @alert.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /alerts/1
-  # DELETE /alerts/1.json
-  def destroy
-    @alert.destroy
-    respond_to do |format|
-      format.html { redirect_to alerts_url }
-      format.json { head :no_content }
-    end
-  end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_alert
-      @alert = Alert.find(params[:id])
-    end
-
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def alert_params
-      params.require(:alert).permit(:author_id, :message)
-    end
-end
diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
deleted file mode 100644
index 4ecff17..0000000
--- a/app/controllers/games_controller.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-class GamesController < ApplicationController
-  before_action :set_game, only: [:show, :edit, :update, :destroy]
-
-  # GET /games
-  # GET /games.json
-  def index
-    @games = Game.all
-  end
-
-  # GET /games/1
-  # GET /games/1.json
-  def show
-  end
-
-  # GET /games/new
-  def new
-    @game = Game.new
-  end
-
-  # GET /games/1/edit
-  def edit
-  end
-
-  # POST /games
-  # POST /games.json
-  def create
-    @game = Game.new(game_params)
-
-    respond_to do |format|
-      if @game.save
-        format.html { redirect_to @game, notice: 'Game was successfully created.' }
-        format.json { render action: 'show', status: :created, location: @game }
-      else
-        format.html { render action: 'new' }
-        format.json { render json: @game.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PATCH/PUT /games/1
-  # PATCH/PUT /games/1.json
-  def update
-    respond_to do |format|
-      if @game.update(game_params)
-        format.html { redirect_to @game, notice: 'Game was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: 'edit' }
-        format.json { render json: @game.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /games/1
-  # DELETE /games/1.json
-  def destroy
-    @game.destroy
-    respond_to do |format|
-      format.html { redirect_to games_url }
-      format.json { head :no_content }
-    end
-  end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_game
-      @game = Game.find(params[:id])
-    end
-
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def game_params
-      params.require(:game).permit(:name, :players_per_team, :teams_per_match, :set_rounds, :randomized_teams)
-    end
-end
diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
deleted file mode 100644
index 6519d7b..0000000
--- a/app/controllers/main_controller.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class MainController < ApplicationController
-end
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
deleted file mode 100644
index e9f3c5a..0000000
--- a/app/controllers/matches_controller.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-class MatchesController < ApplicationController
-  before_action :set_match, only: [:show, :edit, :update, :destroy]
-
-  # GET /matches
-  # GET /matches.json
-  def index
-    @matches = Match.all
-  end
-
-  # GET /matches/1
-  # GET /matches/1.json
-  def show
-  end
-
-  # GET /matches/new
-  def new
-    @match = Match.new
-  end
-
-  # GET /matches/1/edit
-  def edit
-  end
-
-  # POST /matches
-  # POST /matches.json
-  def create
-    @match = Match.new(match_params)
-
-    respond_to do |format|
-      if @match.save
-        format.html { redirect_to @match, notice: 'Match was successfully created.' }
-        format.json { render action: 'show', status: :created, location: @match }
-      else
-        format.html { render action: 'new' }
-        format.json { render json: @match.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PATCH/PUT /matches/1
-  # PATCH/PUT /matches/1.json
-  def update
-    respond_to do |format|
-      if @match.update(match_params)
-        format.html { redirect_to @match, notice: 'Match was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: 'edit' }
-        format.json { render json: @match.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /matches/1
-  # DELETE /matches/1.json
-  def destroy
-    @match.destroy
-    respond_to do |format|
-      format.html { redirect_to matches_url }
-      format.json { head :no_content }
-    end
-  end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_match
-      @match = Match.find(params[:id])
-    end
-
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def match_params
-      params.require(:match).permit(:tournament_id)
-    end
-end
diff --git a/app/controllers/pms_controller.rb b/app/controllers/pms_controller.rb
deleted file mode 100644
index 5dd0d69..0000000
--- a/app/controllers/pms_controller.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-class PmsController < ApplicationController
-  before_action :set_pm, only: [:show, :edit, :update, :destroy]
-
-  # GET /pms
-  # GET /pms.json
-  def index
-    @pms = Pm.all
-  end
-
-  # GET /pms/1
-  # GET /pms/1.json
-  def show
-  end
-
-  # GET /pms/new
-  def new
-    @pm = Pm.new
-  end
-
-  # GET /pms/1/edit
-  def edit
-  end
-
-  # POST /pms
-  # POST /pms.json
-  def create
-    @pm = Pm.new(pm_params)
-
-    respond_to do |format|
-      if @pm.save
-        format.html { redirect_to @pm, notice: 'Pm was successfully created.' }
-        format.json { render action: 'show', status: :created, location: @pm }
-      else
-        format.html { render action: 'new' }
-        format.json { render json: @pm.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PATCH/PUT /pms/1
-  # PATCH/PUT /pms/1.json
-  def update
-    respond_to do |format|
-      if @pm.update(pm_params)
-        format.html { redirect_to @pm, notice: 'Pm was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: 'edit' }
-        format.json { render json: @pm.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /pms/1
-  # DELETE /pms/1.json
-  def destroy
-    @pm.destroy
-    respond_to do |format|
-      format.html { redirect_to pms_url }
-      format.json { head :no_content }
-    end
-  end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_pm
-      @pm = Pm.find(params[:id])
-    end
-
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def pm_params
-      params.require(:pm).permit(:author_id, :recipient_id, :message)
-    end
-end
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
deleted file mode 100644
index ee61487..0000000
--- a/app/controllers/search_controller.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class SearchController < ApplicationController
-end
diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb
deleted file mode 100644
index 7d54eb6..0000000
--- a/app/controllers/servers_controller.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-class ServersController < ApplicationController
-  before_action :set_server, only: [:show, :edit, :update, :destroy]
-
-  # GET /servers
-  # GET /servers.json
-  def index
-    @servers = Server.all
-  end
-
-  # GET /servers/1
-  # GET /servers/1.json
-  def show
-  end
-
-  # GET /servers/new
-  def new
-    @server = Server.new
-  end
-
-  # GET /servers/1/edit
-  def edit
-  end
-
-  # POST /servers
-  # POST /servers.json
-  def create
-    @server = Server.new(server_params)
-
-    respond_to do |format|
-      if @server.save
-        format.html { redirect_to @server, notice: 'Server was successfully created.' }
-        format.json { render action: 'show', status: :created, location: @server }
-      else
-        format.html { render action: 'new' }
-        format.json { render json: @server.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PATCH/PUT /servers/1
-  # PATCH/PUT /servers/1.json
-  def update
-    respond_to do |format|
-      if @server.update(server_params)
-        format.html { redirect_to @server, notice: 'Server was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: 'edit' }
-        format.json { render json: @server.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /servers/1
-  # DELETE /servers/1.json
-  def destroy
-    @server.destroy
-    respond_to do |format|
-      format.html { redirect_to servers_url }
-      format.json { head :no_content }
-    end
-  end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_server
-      @server = Server.find(params[:id])
-    end
-
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def server_params
-      params[:server]
-    end
-end
diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
deleted file mode 100644
index f14c97f..0000000
--- a/app/controllers/teams_controller.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-class TeamsController < ApplicationController
-  before_action :set_team, only: [:show, :edit, :update, :destroy]
-
-  # GET /teams
-  # GET /teams.json
-  def index
-    @teams = Team.all
-  end
-
-  # GET /teams/1
-  # GET /teams/1.json
-  def show
-  end
-
-  # GET /teams/new
-  def new
-    @team = Team.new
-  end
-
-  # GET /teams/1/edit
-  def edit
-  end
-
-  # POST /teams
-  # POST /teams.json
-  def create
-    @team = Team.new(team_params)
-
-    respond_to do |format|
-      if @team.save
-        format.html { redirect_to @team, notice: 'Team was successfully created.' }
-        format.json { render action: 'show', status: :created, location: @team }
-      else
-        format.html { render action: 'new' }
-        format.json { render json: @team.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PATCH/PUT /teams/1
-  # PATCH/PUT /teams/1.json
-  def update
-    respond_to do |format|
-      if @team.update(team_params)
-        format.html { redirect_to @team, notice: 'Team was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: 'edit' }
-        format.json { render json: @team.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /teams/1
-  # DELETE /teams/1.json
-  def destroy
-    @team.destroy
-    respond_to do |format|
-      format.html { redirect_to teams_url }
-      format.json { head :no_content }
-    end
-  end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_team
-      @team = Team.find(params[:id])
-    end
-
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def team_params
-      params[:team]
-    end
-end
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
deleted file mode 100644
index 720305f..0000000
--- a/app/controllers/tournaments_controller.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-class TournamentsController < ApplicationController
-  before_action :set_tournament, only: [:show, :edit, :update, :destroy]
-
-  # GET /tournaments
-  # GET /tournaments.json
-  def index
-    @tournaments = Tournament.all
-  end
-
-  # GET /tournaments/1
-  # GET /tournaments/1.json
-  def show
-  end
-
-  # GET /tournaments/new
-  def new
-    @tournament = Tournament.new
-  end
-
-  # GET /tournaments/1/edit
-  def edit
-  end
-
-  # POST /tournaments
-  # POST /tournaments.json
-  def create
-    @tournament = Tournament.new(tournament_params)
-
-    respond_to do |format|
-      if @tournament.save
-        format.html { redirect_to @tournament, notice: 'Tournament was successfully created.' }
-        format.json { render action: 'show', status: :created, location: @tournament }
-      else
-        format.html { render action: 'new' }
-        format.json { render json: @tournament.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # PATCH/PUT /tournaments/1
-  # PATCH/PUT /tournaments/1.json
-  def update
-    respond_to do |format|
-      if @tournament.update(tournament_params)
-        format.html { redirect_to @tournament, notice: 'Tournament was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: 'edit' }
-        format.json { render json: @tournament.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /tournaments/1
-  # DELETE /tournaments/1.json
-  def destroy
-    @tournament.destroy
-    respond_to do |format|
-      format.html { redirect_to tournaments_url }
-      format.json { head :no_content }
-    end
-  end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_tournament
-      @tournament = Tournament.find(params[:id])
-    end
-
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def tournament_params
-      params.require(:tournament).permit(:game_id)
-    end
-end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
deleted file mode 100644
index 3e74dea..0000000
--- a/app/controllers/users_controller.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class UsersController < ApplicationController
-end