diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
commit | b677983475513c78108406901fccd5cbe9604ca6 (patch) | |
tree | f83b5e20930cbe1be890af41ea1d0c0d2ebf5e2e /app/controllers/servers_controller.rb | |
parent | 4e682a9a8596326a2d1faab6c44e5a54918c5ba0 (diff) | |
parent | 1bfc0513fa113f5b4a61e89d74e42dd78ece44e7 (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
Gemfile.lock
app/views/layouts/application.html.erb
config/routes.rb
Diffstat (limited to 'app/controllers/servers_controller.rb')
-rw-r--r-- | app/controllers/servers_controller.rb | 74 |
1 files changed, 0 insertions, 74 deletions
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 |