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

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/views/layouts/application.html.erb
	db/migrate/20140304043618_create_servers.rb
	db/migrate/20140304043622_create_matches.rb
	db/migrate/20140304043631_create_games.rb

1 files changed, 74 insertions, 0 deletions

diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb
new file mode 100644
index 0000000..7d54eb6
--- /dev/null
+++ b/app/controllers/servers_controller.rb
@@ -0,0 +1,74 @@
+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