diff options
| -rw-r--r-- | app/controllers/alerts_controller.rb | 124 | ||||
| -rw-r--r-- | app/controllers/application_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/games_controller.rb | 124 | ||||
| -rw-r--r-- | app/controllers/matches_controller.rb | 124 | ||||
| -rw-r--r-- | app/controllers/pms_controller.rb | 124 | ||||
| -rw-r--r-- | app/controllers/remote_usernames_controller.rb | 124 | ||||
| -rw-r--r-- | app/controllers/servers_controller.rb | 124 | ||||
| -rw-r--r-- | app/controllers/sessions_controller.rb | 124 | ||||
| -rw-r--r-- | app/controllers/teams_controller.rb | 124 | ||||
| -rw-r--r-- | app/controllers/tournaments_controller.rb | 124 | ||||
| -rw-r--r-- | app/controllers/users_controller.rb | 124 | ||||
| -rw-r--r-- | app/models/alert.rb | 2 | ||||
| -rw-r--r-- | app/models/game_setting.rb | 2 | ||||
| -rw-r--r-- | app/models/match.rb | 4 | ||||
| -rw-r--r-- | app/models/pm.rb | 4 | ||||
| -rw-r--r-- | app/models/remote_username.rb | 4 | ||||
| -rw-r--r-- | app/models/score.rb | 4 | ||||
| -rw-r--r-- | app/models/session.rb | 2 | ||||
| -rw-r--r-- | app/models/team.rb | 2 | ||||
| -rw-r--r-- | app/models/tournament.rb | 2 | ||||
| -rw-r--r-- | app/models/tournament_preference.rb | 2 | ||||
| -rw-r--r-- | db/migrate/20140403155007_create_servers.rb (renamed from db/migrate/20140403151738_create_servers.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155008_create_matches.rb (renamed from db/migrate/20140403151741_create_matches.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155011_create_teams.rb (renamed from db/migrate/20140403151743_create_teams.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155012_create_alerts.rb (renamed from db/migrate/20140403151746_create_alerts.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155014_create_pms.rb (renamed from db/migrate/20140403151749_create_pms.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155017_create_tournaments.rb (renamed from db/migrate/20140403151751_create_tournaments.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155019_create_games.rb (renamed from db/migrate/20140403151753_create_games.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155020_create_users.rb (renamed from db/migrate/20140403151756_create_users.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155022_create_sessions.rb (renamed from db/migrate/20140403151758_create_sessions.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155024_create_remote_usernames.rb (renamed from db/migrate/20140403151801_create_remote_usernames.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155026_create_server_settings.rb (renamed from db/migrate/20140403151803_create_server_settings.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155029_create_game_settings.rb (renamed from db/migrate/20140403151806_create_game_settings.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155030_create_tournament_preferences.rb (renamed from db/migrate/20140403151808_create_tournament_preferences.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155032_create_scores.rb (renamed from db/migrate/20140403151811_create_scores.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155035_create_tournament_players_join_table.rb (renamed from db/migrate/20140403151815_create_tournament_players_join_table.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155038_create_tournament_hosts_join_table.rb (renamed from db/migrate/20140403151818_create_tournament_hosts_join_table.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155039_create_team_user_join_table.rb (renamed from db/migrate/20140403151820_create_team_user_join_table.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155042_create_match_team_join_table.rb (renamed from db/migrate/20140403151823_create_match_team_join_table.rb) | 0 | ||||
| -rw-r--r-- | db/migrate/20140403155049_add_hidden_attrs_to_user.rb (renamed from db/migrate/20140403151832_add_hidden_attrs_to_user.rb) | 0 | ||||
| -rw-r--r-- | db/schema.rb | 2 |
41 files changed, 638 insertions, 638 deletions
diff --git a/app/controllers/alerts_controller.rb b/app/controllers/alerts_controller.rb index 873e9b7..a3cb8f9 100644 --- a/app/controllers/alerts_controller.rb +++ b/app/controllers/alerts_controller.rb @@ -1,74 +1,74 @@ class AlertsController < ApplicationController - before_action :set_alert, only: [:show, :edit, :update, :destroy] + before_action :set_alert, only: [:show, :edit, :update, :destroy] - # GET /alerts - # GET /alerts.json - def index - @alerts = Alert.all - end + # GET /alerts + # GET /alerts.json + def index + @alerts = Alert.all + end - # GET /alerts/1 - # GET /alerts/1.json - def show - end + # GET /alerts/1 + # GET /alerts/1.json + def show + end - # GET /alerts/new - def new - @alert = Alert.new - end + # GET /alerts/new + def new + @alert = Alert.new + end - # GET /alerts/1/edit - def edit - end + # GET /alerts/1/edit + def edit + end - # POST /alerts - # POST /alerts.json - def create - @alert = Alert.new(alert_params) + # 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 + 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 + # 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 + # 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 + 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 + # 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/application_controller.rb b/app/controllers/application_controller.rb index d83690e..27ef6a7 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,5 +1,5 @@ class ApplicationController < ActionController::Base - # Prevent CSRF attacks by raising an exception. - # For APIs, you may want to use :null_session instead. - protect_from_forgery with: :exception + # Prevent CSRF attacks by raising an exception. + # For APIs, you may want to use :null_session instead. + protect_from_forgery with: :exception end 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 diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index 64414cf..32108d9 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -1,74 +1,74 @@ class MatchesController < ApplicationController - before_action :set_match, only: [:show, :edit, :update, :destroy] + before_action :set_match, only: [:show, :edit, :update, :destroy] - # GET /matches - # GET /matches.json - def index - @matches = Match.all - end + # GET /matches + # GET /matches.json + def index + @matches = Match.all + end - # GET /matches/1 - # GET /matches/1.json - def show - end + # GET /matches/1 + # GET /matches/1.json + def show + end - # GET /matches/new - def new - @match = Match.new - end + # GET /matches/new + def new + @match = Match.new + end - # GET /matches/1/edit - def edit - end + # GET /matches/1/edit + def edit + end - # POST /matches - # POST /matches.json - def create - @match = Match.new(match_params) + # 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 + 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 + # 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 + # 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 + 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(:status, :tournament_id, :name, :winner_id, :remote_id) - end + # Never trust parameters from the scary internet, only allow the white list through. + def match_params + params.require(:match).permit(:status, :tournament_id, :name, :winner_id, :remote_id) + end end diff --git a/app/controllers/pms_controller.rb b/app/controllers/pms_controller.rb index 5dd0d69..b62a6ef 100644 --- a/app/controllers/pms_controller.rb +++ b/app/controllers/pms_controller.rb @@ -1,74 +1,74 @@ class PmsController < ApplicationController - before_action :set_pm, only: [:show, :edit, :update, :destroy] + before_action :set_pm, only: [:show, :edit, :update, :destroy] - # GET /pms - # GET /pms.json - def index - @pms = Pm.all - end + # GET /pms + # GET /pms.json + def index + @pms = Pm.all + end - # GET /pms/1 - # GET /pms/1.json - def show - end + # GET /pms/1 + # GET /pms/1.json + def show + end - # GET /pms/new - def new - @pm = Pm.new - end + # GET /pms/new + def new + @pm = Pm.new + end - # GET /pms/1/edit - def edit - end + # GET /pms/1/edit + def edit + end - # POST /pms - # POST /pms.json - def create - @pm = Pm.new(pm_params) + # 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 + 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 + # 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 + # 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 + 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 + # 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/remote_usernames_controller.rb b/app/controllers/remote_usernames_controller.rb index fecf01f..8676c00 100644 --- a/app/controllers/remote_usernames_controller.rb +++ b/app/controllers/remote_usernames_controller.rb @@ -1,74 +1,74 @@ class RemoteUsernamesController < ApplicationController - before_action :set_remote_username, only: [:show, :edit, :update, :destroy] + before_action :set_remote_username, only: [:show, :edit, :update, :destroy] - # GET /remote_usernames - # GET /remote_usernames.json - def index - @remote_usernames = RemoteUsername.all - end + # GET /remote_usernames + # GET /remote_usernames.json + def index + @remote_usernames = RemoteUsername.all + end - # GET /remote_usernames/1 - # GET /remote_usernames/1.json - def show - end + # GET /remote_usernames/1 + # GET /remote_usernames/1.json + def show + end - # GET /remote_usernames/new - def new - @remote_username = RemoteUsername.new - end + # GET /remote_usernames/new + def new + @remote_username = RemoteUsername.new + end - # GET /remote_usernames/1/edit - def edit - end + # GET /remote_usernames/1/edit + def edit + end - # POST /remote_usernames - # POST /remote_usernames.json - def create - @remote_username = RemoteUsername.new(remote_username_params) + # POST /remote_usernames + # POST /remote_usernames.json + def create + @remote_username = RemoteUsername.new(remote_username_params) - respond_to do |format| - if @remote_username.save - format.html { redirect_to @remote_username, notice: 'Remote username was successfully created.' } - format.json { render action: 'show', status: :created, location: @remote_username } - else - format.html { render action: 'new' } - format.json { render json: @remote_username.errors, status: :unprocessable_entity } - end - end - end + respond_to do |format| + if @remote_username.save + format.html { redirect_to @remote_username, notice: 'Remote username was successfully created.' } + format.json { render action: 'show', status: :created, location: @remote_username } + else + format.html { render action: 'new' } + format.json { render json: @remote_username.errors, status: :unprocessable_entity } + end + end + end - # PATCH/PUT /remote_usernames/1 - # PATCH/PUT /remote_usernames/1.json - def update - respond_to do |format| - if @remote_username.update(remote_username_params) - format.html { redirect_to @remote_username, notice: 'Remote username was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: 'edit' } - format.json { render json: @remote_username.errors, status: :unprocessable_entity } - end - end - end + # PATCH/PUT /remote_usernames/1 + # PATCH/PUT /remote_usernames/1.json + def update + respond_to do |format| + if @remote_username.update(remote_username_params) + format.html { redirect_to @remote_username, notice: 'Remote username was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: 'edit' } + format.json { render json: @remote_username.errors, status: :unprocessable_entity } + end + end + end - # DELETE /remote_usernames/1 - # DELETE /remote_usernames/1.json - def destroy - @remote_username.destroy - respond_to do |format| - format.html { redirect_to remote_usernames_url } - format.json { head :no_content } - end - end + # DELETE /remote_usernames/1 + # DELETE /remote_usernames/1.json + def destroy + @remote_username.destroy + respond_to do |format| + format.html { redirect_to remote_usernames_url } + format.json { head :no_content } + end + end - private - # Use callbacks to share common setup or constraints between actions. - def set_remote_username - @remote_username = RemoteUsername.find(params[:id]) - end + private + # Use callbacks to share common setup or constraints between actions. + def set_remote_username + @remote_username = RemoteUsername.find(params[:id]) + end - # Never trust parameters from the scary internet, only allow the white list through. - def remote_username_params - params.require(:remote_username).permit(:game_id, :user_id, :user_name) - end + # Never trust parameters from the scary internet, only allow the white list through. + def remote_username_params + params.require(:remote_username).permit(:game_id, :user_id, :user_name) + end end diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb index 7d54eb6..43999c4 100644 --- a/app/controllers/servers_controller.rb +++ b/app/controllers/servers_controller.rb @@ -1,74 +1,74 @@ class ServersController < ApplicationController - before_action :set_server, only: [:show, :edit, :update, :destroy] + before_action :set_server, only: [:show, :edit, :update, :destroy] - # GET /servers - # GET /servers.json - def index - @servers = Server.all - end + # GET /servers + # GET /servers.json + def index + @servers = Server.all + end - # GET /servers/1 - # GET /servers/1.json - def show - end + # GET /servers/1 + # GET /servers/1.json + def show + end - # GET /servers/new - def new - @server = Server.new - end + # GET /servers/new + def new + @server = Server.new + end - # GET /servers/1/edit - def edit - end + # GET /servers/1/edit + def edit + end - # POST /servers - # POST /servers.json - def create - @server = Server.new(server_params) + # 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 + 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 + # 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 + # 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 + 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 + # 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/sessions_controller.rb b/app/controllers/sessions_controller.rb index 7df8a9a..b035ea0 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,74 +1,74 @@ class SessionsController < ApplicationController - before_action :set_session, only: [:show, :edit, :update, :destroy] + before_action :set_session, only: [:show, :edit, :update, :destroy] - # GET /sessions - # GET /sessions.json - def index - @sessions = Session.all - end + # GET /sessions + # GET /sessions.json + def index + @sessions = Session.all + end - # GET /sessions/1 - # GET /sessions/1.json - def show - end + # GET /sessions/1 + # GET /sessions/1.json + def show + end - # GET /sessions/new - def new - @session = Session.new - end + # GET /sessions/new + def new + @session = Session.new + end - # GET /sessions/1/edit - def edit - end + # GET /sessions/1/edit + def edit + end - # POST /sessions - # POST /sessions.json - def create - @session = Session.new(session_params) + # POST /sessions + # POST /sessions.json + def create + @session = Session.new(session_params) - respond_to do |format| - if @session.save - format.html { redirect_to @session, notice: 'Session was successfully created.' } - format.json { render action: 'show', status: :created, location: @session } - else - format.html { render action: 'new' } - format.json { render json: @session.errors, status: :unprocessable_entity } - end - end - end + respond_to do |format| + if @session.save + format.html { redirect_to @session, notice: 'Session was successfully created.' } + format.json { render action: 'show', status: :created, location: @session } + else + format.html { render action: 'new' } + format.json { render json: @session.errors, status: :unprocessable_entity } + end + end + end - # PATCH/PUT /sessions/1 - # PATCH/PUT /sessions/1.json - def update - respond_to do |format| - if @session.update(session_params) - format.html { redirect_to @session, notice: 'Session was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: 'edit' } - format.json { render json: @session.errors, status: :unprocessable_entity } - end - end - end + # PATCH/PUT /sessions/1 + # PATCH/PUT /sessions/1.json + def update + respond_to do |format| + if @session.update(session_params) + format.html { redirect_to @session, notice: 'Session was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: 'edit' } + format.json { render json: @session.errors, status: :unprocessable_entity } + end + end + end - # DELETE /sessions/1 - # DELETE /sessions/1.json - def destroy - @session.destroy - respond_to do |format| - format.html { redirect_to sessions_url } - format.json { head :no_content } - end - end + # DELETE /sessions/1 + # DELETE /sessions/1.json + def destroy + @session.destroy + respond_to do |format| + format.html { redirect_to sessions_url } + format.json { head :no_content } + end + end - private - # Use callbacks to share common setup or constraints between actions. - def set_session - @session = Session.find(params[:id]) - end + private + # Use callbacks to share common setup or constraints between actions. + def set_session + @session = Session.find(params[:id]) + end - # Never trust parameters from the scary internet, only allow the white list through. - def session_params - params.require(:session).permit(:user_id, :token) - end + # Never trust parameters from the scary internet, only allow the white list through. + def session_params + params.require(:session).permit(:user_id, :token) + end end diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb index ccd6781..05e7a12 100644 --- a/app/controllers/teams_controller.rb +++ b/app/controllers/teams_controller.rb @@ -1,74 +1,74 @@ class TeamsController < ApplicationController - before_action :set_team, only: [:show, :edit, :update, :destroy] + before_action :set_team, only: [:show, :edit, :update, :destroy] - # GET /teams - # GET /teams.json - def index - @teams = Team.all - end + # GET /teams + # GET /teams.json + def index + @teams = Team.all + end - # GET /teams/1 - # GET /teams/1.json - def show - end + # GET /teams/1 + # GET /teams/1.json + def show + end - # GET /teams/new - def new - @team = Team.new - end + # GET /teams/new + def new + @team = Team.new + end - # GET /teams/1/edit - def edit - end + # GET /teams/1/edit + def edit + end - # POST /teams - # POST /teams.json - def create - @team = Team.new(team_params) + # 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 + 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 + # 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 + # 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 + 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.require(:team).permit(:match_id) - end + # Never trust parameters from the scary internet, only allow the white list through. + def team_params + params.require(:team).permit(:match_id) + end end diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index d7db632..e43976c 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -1,74 +1,74 @@ class TournamentsController < ApplicationController - before_action :set_tournament, only: [:show, :edit, :update, :destroy] + before_action :set_tournament, only: [:show, :edit, :update, :destroy] - # GET /tournaments - # GET /tournaments.json - def index - @tournaments = Tournament.all - end + # GET /tournaments + # GET /tournaments.json + def index + @tournaments = Tournament.all + end - # GET /tournaments/1 - # GET /tournaments/1.json - def show - end + # GET /tournaments/1 + # GET /tournaments/1.json + def show + end - # GET /tournaments/new - def new - @tournament = Tournament.new - end + # GET /tournaments/new + def new + @tournament = Tournament.new + end - # GET /tournaments/1/edit - def edit - end + # GET /tournaments/1/edit + def edit + end - # POST /tournaments - # POST /tournaments.json - def create - @tournament = Tournament.new(tournament_params) + # 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 + 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 + # 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 + # 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 + 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(:name, :game_id, :status, :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 tournament_params + params.require(:tournament).permit(:name, :game_id, :status, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams) + end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b18efed..58bf4c6 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,74 +1,74 @@ class UsersController < ApplicationController - before_action :set_user, only: [:show, :edit, :update, :destroy] + before_action :set_user, only: [:show, :edit, :update, :destroy] - # GET /users - # GET /users.json - def index - @users = User.all - end + # GET /users + # GET /users.json + def index + @users = User.all + end - # GET /users/1 - # GET /users/1.json - def show - end + # GET /users/1 + # GET /users/1.json + def show + end - # GET /users/new - def new - @user = User.new - end + # GET /users/new + def new + @user = User.new + end - # GET /users/1/edit - def edit - end + # GET /users/1/edit + def edit + end - # POST /users - # POST /users.json - def create - @user = User.new(user_params) + # POST /users + # POST /users.json + def create + @user = User.new(user_params) - respond_to do |format| - if @user.save - format.html { redirect_to @user, notice: 'User was successfully created.' } - format.json { render action: 'show', status: :created, location: @user } - else - format.html { render action: 'new' } - format.json { render json: @user.errors, status: :unprocessable_entity } - end - end - end + respond_to do |format| + if @user.save + format.html { redirect_to @user, notice: 'User was successfully created.' } + format.json { render action: 'show', status: :created, location: @user } + else + format.html { render action: 'new' } + format.json { render json: @user.errors, status: :unprocessable_entity } + end + end + end - # PATCH/PUT /users/1 - # PATCH/PUT /users/1.json - def update - respond_to do |format| - if @user.update(user_params) - format.html { redirect_to @user, notice: 'User was successfully updated.' } - format.json { head :no_content } - else - format.html { render action: 'edit' } - format.json { render json: @user.errors, status: :unprocessable_entity } - end - end - end + # PATCH/PUT /users/1 + # PATCH/PUT /users/1.json + def update + respond_to do |format| + if @user.update(user_params) + format.html { redirect_to @user, notice: 'User was successfully updated.' } + format.json { head :no_content } + else + format.html { render action: 'edit' } + format.json { render json: @user.errors, status: :unprocessable_entity } + end + end + end - # DELETE /users/1 - # DELETE /users/1.json - def destroy - @user.destroy - respond_to do |format| - format.html { redirect_to users_url } - format.json { head :no_content } - end - end + # DELETE /users/1 + # DELETE /users/1.json + def destroy + @user.destroy + respond_to do |format| + format.html { redirect_to users_url } + format.json { head :no_content } + end + end - private - # Use callbacks to share common setup or constraints between actions. - def set_user - @user = User.find(params[:id]) - end + private + # Use callbacks to share common setup or constraints between actions. + def set_user + @user = User.find(params[:id]) + end - # Never trust parameters from the scary internet, only allow the white list through. - def user_params - params.require(:user).permit(:name, :email, :user_name) - end + # Never trust parameters from the scary internet, only allow the white list through. + def user_params + params.require(:user).permit(:name, :email, :user_name) + end end diff --git a/app/models/alert.rb b/app/models/alert.rb index 343c269..0516355 100644 --- a/app/models/alert.rb +++ b/app/models/alert.rb @@ -1,3 +1,3 @@ class Alert < ActiveRecord::Base - belongs_to :author + belongs_to :author end diff --git a/app/models/game_setting.rb b/app/models/game_setting.rb index e147b15..bff8d97 100644 --- a/app/models/game_setting.rb +++ b/app/models/game_setting.rb @@ -1,3 +1,3 @@ class GameSetting < ActiveRecord::Base - belongs_to :game + belongs_to :game end diff --git a/app/models/match.rb b/app/models/match.rb index bb814c1..fe68d31 100644 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -1,4 +1,4 @@ class Match < ActiveRecord::Base - belongs_to :tournament - belongs_to :winner + belongs_to :tournament + belongs_to :winner end diff --git a/app/models/pm.rb b/app/models/pm.rb index ab5af3b..9fce2b3 100644 --- a/app/models/pm.rb +++ b/app/models/pm.rb @@ -1,4 +1,4 @@ class Pm < ActiveRecord::Base - belongs_to :author - belongs_to :recipient + belongs_to :author + belongs_to :recipient end diff --git a/app/models/remote_username.rb b/app/models/remote_username.rb index 94e5063..c477f8a 100644 --- a/app/models/remote_username.rb +++ b/app/models/remote_username.rb @@ -1,4 +1,4 @@ class RemoteUsername < ActiveRecord::Base - belongs_to :game - belongs_to :user + belongs_to :game + belongs_to :user end diff --git a/app/models/score.rb b/app/models/score.rb index a9b9c71..11ee9a6 100644 --- a/app/models/score.rb +++ b/app/models/score.rb @@ -1,4 +1,4 @@ class Score < ActiveRecord::Base - belongs_to :user - belongs_to :match + belongs_to :user + belongs_to :match end diff --git a/app/models/session.rb b/app/models/session.rb index c66afec..a5fd26e 100644 --- a/app/models/session.rb +++ b/app/models/session.rb @@ -1,3 +1,3 @@ class Session < ActiveRecord::Base - belongs_to :user + belongs_to :user end diff --git a/app/models/team.rb b/app/models/team.rb index 9e71557..8d89f51 100644 --- a/app/models/team.rb +++ b/app/models/team.rb @@ -1,3 +1,3 @@ class Team < ActiveRecord::Base - belongs_to :match + belongs_to :match end diff --git a/app/models/tournament.rb b/app/models/tournament.rb index cc915a0..dcdb8d5 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -1,3 +1,3 @@ class Tournament < ActiveRecord::Base - belongs_to :game + belongs_to :game end diff --git a/app/models/tournament_preference.rb b/app/models/tournament_preference.rb index 1f335e3..3d15061 100644 --- a/app/models/tournament_preference.rb +++ b/app/models/tournament_preference.rb @@ -1,3 +1,3 @@ class TournamentPreference < ActiveRecord::Base - belongs_to :tournament + belongs_to :tournament end diff --git a/db/migrate/20140403151738_create_servers.rb b/db/migrate/20140403155007_create_servers.rb index f33241a..f33241a 100644 --- a/db/migrate/20140403151738_create_servers.rb +++ b/db/migrate/20140403155007_create_servers.rb diff --git a/db/migrate/20140403151741_create_matches.rb b/db/migrate/20140403155008_create_matches.rb index 31eea12..31eea12 100644 --- a/db/migrate/20140403151741_create_matches.rb +++ b/db/migrate/20140403155008_create_matches.rb diff --git a/db/migrate/20140403151743_create_teams.rb b/db/migrate/20140403155011_create_teams.rb index fdf9a68..fdf9a68 100644 --- a/db/migrate/20140403151743_create_teams.rb +++ b/db/migrate/20140403155011_create_teams.rb diff --git a/db/migrate/20140403151746_create_alerts.rb b/db/migrate/20140403155012_create_alerts.rb index 68a8e10..68a8e10 100644 --- a/db/migrate/20140403151746_create_alerts.rb +++ b/db/migrate/20140403155012_create_alerts.rb diff --git a/db/migrate/20140403151749_create_pms.rb b/db/migrate/20140403155014_create_pms.rb index 93bb5c6..93bb5c6 100644 --- a/db/migrate/20140403151749_create_pms.rb +++ b/db/migrate/20140403155014_create_pms.rb diff --git a/db/migrate/20140403151751_create_tournaments.rb b/db/migrate/20140403155017_create_tournaments.rb index c0d8929..c0d8929 100644 --- a/db/migrate/20140403151751_create_tournaments.rb +++ b/db/migrate/20140403155017_create_tournaments.rb diff --git a/db/migrate/20140403151753_create_games.rb b/db/migrate/20140403155019_create_games.rb index 5e4f56f..5e4f56f 100644 --- a/db/migrate/20140403151753_create_games.rb +++ b/db/migrate/20140403155019_create_games.rb diff --git a/db/migrate/20140403151756_create_users.rb b/db/migrate/20140403155020_create_users.rb index 8032870..8032870 100644 --- a/db/migrate/20140403151756_create_users.rb +++ b/db/migrate/20140403155020_create_users.rb diff --git a/db/migrate/20140403151758_create_sessions.rb b/db/migrate/20140403155022_create_sessions.rb index f667f1e..f667f1e 100644 --- a/db/migrate/20140403151758_create_sessions.rb +++ b/db/migrate/20140403155022_create_sessions.rb diff --git a/db/migrate/20140403151801_create_remote_usernames.rb b/db/migrate/20140403155024_create_remote_usernames.rb index b837e53..b837e53 100644 --- a/db/migrate/20140403151801_create_remote_usernames.rb +++ b/db/migrate/20140403155024_create_remote_usernames.rb diff --git a/db/migrate/20140403151803_create_server_settings.rb b/db/migrate/20140403155026_create_server_settings.rb index dfdd91b..dfdd91b 100644 --- a/db/migrate/20140403151803_create_server_settings.rb +++ b/db/migrate/20140403155026_create_server_settings.rb diff --git a/db/migrate/20140403151806_create_game_settings.rb b/db/migrate/20140403155029_create_game_settings.rb index 0ebbf18..0ebbf18 100644 --- a/db/migrate/20140403151806_create_game_settings.rb +++ b/db/migrate/20140403155029_create_game_settings.rb diff --git a/db/migrate/20140403151808_create_tournament_preferences.rb b/db/migrate/20140403155030_create_tournament_preferences.rb index 991d659..991d659 100644 --- a/db/migrate/20140403151808_create_tournament_preferences.rb +++ b/db/migrate/20140403155030_create_tournament_preferences.rb diff --git a/db/migrate/20140403151811_create_scores.rb b/db/migrate/20140403155032_create_scores.rb index 4ca0b0b..4ca0b0b 100644 --- a/db/migrate/20140403151811_create_scores.rb +++ b/db/migrate/20140403155032_create_scores.rb diff --git a/db/migrate/20140403151815_create_tournament_players_join_table.rb b/db/migrate/20140403155035_create_tournament_players_join_table.rb index be240e8..be240e8 100644 --- a/db/migrate/20140403151815_create_tournament_players_join_table.rb +++ b/db/migrate/20140403155035_create_tournament_players_join_table.rb diff --git a/db/migrate/20140403151818_create_tournament_hosts_join_table.rb b/db/migrate/20140403155038_create_tournament_hosts_join_table.rb index 7521d89..7521d89 100644 --- a/db/migrate/20140403151818_create_tournament_hosts_join_table.rb +++ b/db/migrate/20140403155038_create_tournament_hosts_join_table.rb diff --git a/db/migrate/20140403151820_create_team_user_join_table.rb b/db/migrate/20140403155039_create_team_user_join_table.rb index f3b57fc..f3b57fc 100644 --- a/db/migrate/20140403151820_create_team_user_join_table.rb +++ b/db/migrate/20140403155039_create_team_user_join_table.rb diff --git a/db/migrate/20140403151823_create_match_team_join_table.rb b/db/migrate/20140403155042_create_match_team_join_table.rb index c2ed1b7..c2ed1b7 100644 --- a/db/migrate/20140403151823_create_match_team_join_table.rb +++ b/db/migrate/20140403155042_create_match_team_join_table.rb diff --git a/db/migrate/20140403151832_add_hidden_attrs_to_user.rb b/db/migrate/20140403155049_add_hidden_attrs_to_user.rb index 9b5c505..9b5c505 100644 --- a/db/migrate/20140403151832_add_hidden_attrs_to_user.rb +++ b/db/migrate/20140403155049_add_hidden_attrs_to_user.rb diff --git a/db/schema.rb b/db/schema.rb index 3a87bad..113f16d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140403151832) do +ActiveRecord::Schema.define(version: 20140403155049) do create_table "alerts", force: true do |t| t.integer "author_id" |