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

1 files changed, 62 insertions, 62 deletions

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 5780152..e9620b4 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -1,74 +1,74 @@
 class GamesController < ApplicationController
-  before_action :set_game, only: [:show, :edit, :update, :destroy]
+	before_action :set_game, only: [:show, :edit, :update, :destroy]
 
-  # GET /games
-  # GET /games.json
-  def index
-    @games = Game.all
-  end
+	# GET /games
+	# GET /games.json
+	def index
+		@games = Game.all
+	end
 
-  # GET /games/1
-  # GET /games/1.json
-  def show
-  end
+	# GET /games/1
+	# GET /games/1.json
+	def show
+	end
 
-  # GET /games/new
-  def new
-    @game = Game.new
-  end
+	# GET /games/new
+	def new
+		@game = Game.new
+	end
 
-  # GET /games/1/edit
-  def edit
-  end
+	# GET /games/1/edit
+	def edit
+	end
 
-  # POST /games
-  # POST /games.json
-  def create
-    @game = Game.new(game_params)
+	# 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
+		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
+	# 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
+	# 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
+	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, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams)
-    end
+	# Never trust parameters from the scary internet, only allow the white list through.
+	def game_params
+		params.require(:game).permit(:name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams)
+	end
 end