solved merge conflicts

1 files changed, 8 insertions, 45 deletions

diff --git a/app/controllers/servers_controller.rb b/app/controllers/servers_controller.rb
index 6596dc6..83a9f31 100644
--- a/app/controllers/servers_controller.rb
+++ b/app/controllers/servers_controller.rb
@@ -1,43 +1,15 @@
 class ServersController < ApplicationController
-
-	# GET /servers
-	# GET /servers.json
-	def index
-		@servers = Server.all
-	end
-
-	# GET /servers/1
-	# GET /servers/1.json
+	# GET /server
+	# GET /server.json
 	def show
 	end
 
-	# GET /servers/new
-	def new
-		@server = Server.new
-	end
-
-	# GET /servers/1/edit
+	# GET /server/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
+	# PATCH/PUT /server
+	# PATCH/PUT /server.json
 	def update
 		respond_to do |format|
 			if @server.update(server_params)
@@ -50,24 +22,15 @@ class ServersController < ApplicationController
 		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])
+		@server = Server.first
 	end
 
 	# Never trust parameters from the scary internet, only allow the white list through.
 	def server_params
-		params[:server]
+		params.require(:server).permit(:default_user_permissions, :default_user_abilities => User.permission_bits.keys)
 	end
 end