Skip to content
Browse files

Removing actions that are not needed.

  • Loading branch information...
1 parent bb4cfe1 commit a67d18c90583979aa62a07f8f572ec7c88800a2d @nahurst committed Mar 18, 2013
Showing with 0 additions and 33 deletions.
  1. +0 −33 app/controllers/mail_merges_controller.rb
View
33 app/controllers/mail_merges_controller.rb
@@ -32,11 +32,6 @@ def new
end
end
- # GET /mail_merges/1/edit
- def edit
- @mail_merge = MailMerge.find(params[:id])
- end
-
# POST /mail_merges
# POST /mail_merges.json
def create
@@ -52,32 +47,4 @@ def create
end
end
end
-
- # PUT /mail_merges/1
- # PUT /mail_merges/1.json
- def update
- @mail_merge = MailMerge.find(params[:id])
-
- respond_to do |format|
- if @mail_merge.update_attributes(params[:mail_merge])
- format.html { redirect_to @mail_merge, notice: 'Mail merge was successfully updated.' }
- format.json { head :no_content }
- else
- format.html { render action: "edit" }
- format.json { render json: @mail_merge.errors, status: :unprocessable_entity }
- end
- end
- end
-
- # DELETE /mail_merges/1
- # DELETE /mail_merges/1.json
- def destroy
- @mail_merge = MailMerge.find(params[:id])
- @mail_merge.destroy
-
- respond_to do |format|
- format.html { redirect_to mail_merges_url }
- format.json { head :no_content }
- end
- end
end

0 comments on commit a67d18c

Please sign in to comment.
Something went wrong with that request. Please try again.