From f169049003db03696ce80a710371a09495280e0d Mon Sep 17 00:00:00 2001
From: Stella Rouzi <differentreality@gmail.com>
Date: Tue, 12 Aug 2014 22:27:02 +0300
Subject: [PATCH] write in 1 single line actions with no body

Conflicts:
	app/controllers/admin/contacts_controller.rb
---
 app/controllers/admin/campaigns_controller.rb   | 6 ++----
 app/controllers/admin/commercials_controller.rb | 3 +--
 app/controllers/admin/events_controller.rb      | 3 +--
 app/controllers/admin/lodgings_controller.rb    | 3 +--
 app/controllers/admin/photos_controller.rb      | 3 +--
 app/controllers/admin/users_controller.rb       | 3 +--
 app/controllers/admin/venue_controller.rb       | 3 +--
 app/controllers/commercials_controller.rb       | 3 +--
 app/controllers/conference_controller.rb        | 3 +--
 app/controllers/event_attachments_controller.rb | 3 +--
 10 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/app/controllers/admin/campaigns_controller.rb b/app/controllers/admin/campaigns_controller.rb
index b3add716..fc8f91b0 100644
--- a/app/controllers/admin/campaigns_controller.rb
+++ b/app/controllers/admin/campaigns_controller.rb
@@ -21,11 +21,9 @@ module Admin
       end
     end
 
-    def new
-    end
+    def new; end
 
-    def edit
-    end
+    def edit; end
 
     def update
       if @campaign.update_attributes(params[:campaign])
diff --git a/app/controllers/admin/commercials_controller.rb b/app/controllers/admin/commercials_controller.rb
index 9e4e29a5..c2a927a9 100644
--- a/app/controllers/admin/commercials_controller.rb
+++ b/app/controllers/admin/commercials_controller.rb
@@ -11,8 +11,7 @@ module Admin
       @commercial = @conference.commercials.build
     end
 
-    def edit
-    end
+    def edit; end
 
     def create
       @commercial = @conference.commercials.build(commercial_params)
diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb
index a807ac5d..0fbd8f77 100644
--- a/app/controllers/admin/events_controller.rb
+++ b/app/controllers/admin/events_controller.rb
@@ -124,8 +124,7 @@ module Admin
       redirect_back_or_to(admin_conference_event_path(@conference.short_title, @event))
     end
 
-    def create
-    end
+    def create; end
 
     def accept
       send_mail = @event.conference.email_settings.send_on_accepted
diff --git a/app/controllers/admin/lodgings_controller.rb b/app/controllers/admin/lodgings_controller.rb
index 992d7921..7db38e66 100644
--- a/app/controllers/admin/lodgings_controller.rb
+++ b/app/controllers/admin/lodgings_controller.rb
@@ -8,8 +8,7 @@ module Admin
       authorize! :update, Lodging.new(venue_id: @venue.id)
     end
 
-    def show
-    end
+    def show; end
 
     def update
       if @venue.update_attributes(params[:venue])
diff --git a/app/controllers/admin/photos_controller.rb b/app/controllers/admin/photos_controller.rb
index 9296115b..c5f58167 100644
--- a/app/controllers/admin/photos_controller.rb
+++ b/app/controllers/admin/photos_controller.rb
@@ -14,8 +14,7 @@ module Admin
     end
 
 # GET /admin/photos/1/edit
-    def edit
-    end
+    def edit; end
 
 # POST /admin/photos
     def create
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index f0d5b5b1..1ce567cb 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -24,8 +24,7 @@ module Admin
       redirect_to admin_users_path, notice: "Updated #{@user.email}"
     end
 
-    def edit
-    end
+    def edit; end
 
     def destroy
       @user.destroy
diff --git a/app/controllers/admin/venue_controller.rb b/app/controllers/admin/venue_controller.rb
index e308fc7e..14d08cd1 100644
--- a/app/controllers/admin/venue_controller.rb
+++ b/app/controllers/admin/venue_controller.rb
@@ -3,8 +3,7 @@ module Admin
     load_and_authorize_resource :conference, find_by: :short_title
     load_and_authorize_resource :venue, through: :conference, singleton: true
 
-    def index
-    end
+    def index; end
 
     def update
       @venue = @conference.venue
diff --git a/app/controllers/commercials_controller.rb b/app/controllers/commercials_controller.rb
index fdf71b37..79a87f30 100644
--- a/app/controllers/commercials_controller.rb
+++ b/app/controllers/commercials_controller.rb
@@ -8,8 +8,7 @@ class CommercialsController < ApplicationController
     authorize! :new, @commercial
   end
 
-  def edit
-  end
+  def edit; end
 
   def create
     @commercial = @event.commercials.build(commercial_params)
diff --git a/app/controllers/conference_controller.rb b/app/controllers/conference_controller.rb
index f809c225..488ec052 100644
--- a/app/controllers/conference_controller.rb
+++ b/app/controllers/conference_controller.rb
@@ -1,8 +1,7 @@
 class ConferenceController < ApplicationController
   load_and_authorize_resource find_by: :short_title
 
-  def show
-  end
+  def show; end
 
   def subscribe
     conference = Conference.find_by_short_title(params[:id])
diff --git a/app/controllers/event_attachments_controller.rb b/app/controllers/event_attachments_controller.rb
index 5b5dade2..f58e4989 100644
--- a/app/controllers/event_attachments_controller.rb
+++ b/app/controllers/event_attachments_controller.rb
@@ -42,8 +42,7 @@ class EventAttachmentsController < ApplicationController
     end
   end
 
-  def edit
-  end
+  def edit; end
 
   def create
     params[:event_attachment][:title] = params[:title][0]