Merge pull request #276 from openSUSE/review_140630_rubocop_fix_1

add skipped empty lines

app/controllers/admin/dietchoices_controller.rb

@@ -13,4 +13,4 @@ class Admin::DietchoicesController < ApplicationController
       redirect_to(admin_conference_dietary_list_path(:conference_id => @conference.short_title), :alert => "Dietary choices update failed: #{e.message}")
     end
   end
-end
+end

app/controllers/admin/difficulty_levels_controller.rb

@@ -27,4 +27,4 @@ class Admin::DifficultyLevelsController < ApplicationController
     end
 
   end
-end
+end

app/controllers/admin/questions_controller.rb

@@ -93,4 +93,4 @@ class Admin::QuestionsController < ApplicationController
     @questions = Question.where(:global => true).all | Question.where(:conference_id => @conference.id)
     @questions_conference = @conference.questions    
   end
-end
+end

app/controllers/admin/stats_controller.rb

@@ -228,3 +228,4 @@ module Admin
     helper_method :social_event_count
   end
 end
+

app/controllers/admin/supporter_levels_controller.rb

@@ -13,4 +13,4 @@ class Admin::SupporterLevelsController < ApplicationController
       redirect_to(admin_conference_supporter_levels_path(:conference_id => @conference.short_title), :alert => "Supporter levels update failed: #{e.message}")
     end
   end
-end
+end

app/controllers/event_attachments_controller.rb

@@ -111,4 +111,4 @@ class EventAttachmentsController < ApplicationController
       format.json { head :no_content }
     end
   end
-end
+end

app/helpers/proposal_helper.rb

@@ -10,4 +10,4 @@ module ProposalHelper
     end.join("\n")
     str
   end
-end
+end

app/helpers/registration_helper.rb

@@ -11,4 +11,4 @@ module RegistrationHelper
     end.join("\n")
     str
   end
-end
+end

app/models/datatable.rb

@@ -96,4 +96,4 @@ class Datatable
     index = "sSortDir_#{index}"
     params[index] == "desc" ? "desc" : "asc"
   end
-end
+end

app/models/difficulty_level.rb

@@ -5,4 +5,4 @@ class DifficultyLevel < ActiveRecord::Base
   has_many :events
 
   validates :title, :presence => true
-end
+end

app/models/event_person.rb

@@ -0,0 +1,8 @@
+class EventPerson < ActiveRecord::Base
+  attr_accessible :event, :person, :person_id, :event_role
+  # TODO Do we need these roles?
+  ROLES = [["Speaker","speaker"], ["Submitter","submitter"], ["Moderator","moderator"]]
+
+  belongs_to :event
+  belongs_to :person
+end

app/models/question.rb

@@ -11,4 +11,4 @@ class Question < ActiveRecord::Base
   validates :answers, :presence => true
   
   accepts_nested_attributes_for :answers, :allow_destroy => true
-end
+end

app/models/role.rb

@@ -1,4 +1,4 @@
 class Role < ActiveRecord::Base
   attr_accessible :name
   has_and_belongs_to_many :users
-end
+end

app/models/room.rb

@@ -16,4 +16,4 @@ class Room < ActiveRecord::Base
     self.guid = guid
   end
 
-end
+end

app/models/social_event.rb

@@ -3,4 +3,4 @@ class SocialEvent < ActiveRecord::Base
 
   belongs_to :conference
   has_and_belongs_to_many :registrations
-end
+end

app/models/track.rb

@@ -15,4 +15,4 @@ class Track < ActiveRecord::Base
     self.guid = guid
   end
 
-end
+end

app/models/vday.rb

@@ -5,4 +5,4 @@ class Vday < ActiveRecord::Base
 
   has_many :vchoices
   has_many :vpositions, :through => :vchoices, :dependent => :destroy
-end
+end

app/models/vote.rb

@@ -3,6 +3,6 @@ class Vote < ActiveRecord::Base
 
   belongs_to :user
   belongs_to :event
-
   delegate :name, to: :user
+
 end

db/migrate/20121223122307_create_event_people_table.rb

@@ -15,4 +15,3 @@ class CreateEventPeopleTable < ActiveRecord::Migration
     drop_table :event_people
   end
 end
-

db/migrate/20121223122842_create_venue_table.rb

@@ -17,4 +17,3 @@ class CreateVenueTable < ActiveRecord::Migration
   end
 
 end
-

db/migrate/20121223135447_user_roles_table.rb

@@ -9,4 +9,3 @@ class UserRolesTable < ActiveRecord::Migration
     drop_table :roles_users
   end
 end
-

db/seeds.rb

@@ -23,4 +23,4 @@ for i in questions_yes_no do
 
   Qanswer.create(:question_id => q.id, :answer_id => answer_no.id)
   Qanswer.create(:question_id => q.id, :answer_id => answer_yes.id)
-end
+end

spec/controllers/admin/users_controller_spec.rb

@@ -52,4 +52,4 @@ describe Admin::UsersController do
     end
   end
 
-end
+end

spec/factories/difficulty_levels.rb

@@ -6,4 +6,4 @@ FactoryGirl.define do
     conference
   end
 
-end
+end

spec/factories/social_events.rb

@@ -6,4 +6,4 @@ FactoryGirl.define do
     conference
   end
 
-end
+end

spec/factories/supporter_levels.rb

@@ -5,4 +5,4 @@ FactoryGirl.define do
     conference
   end
 
-end
+end

spec/factories/tracks.rb

@@ -6,4 +6,4 @@ FactoryGirl.define do
     conference
   end
 
-end
+end

spec/factories/vdays.rb

@@ -5,4 +5,4 @@ FactoryGirl.define do
     conference
   end
 
-end
+end

spec/factories/vpositions.rb

@@ -9,4 +9,4 @@ FactoryGirl.define do
     end
   end
 
-end
+end

spec/support/sidebar.rb

@@ -5,4 +5,4 @@ module Sidebar
     render 
     expect(view).to render_template('admin/conference/_sidebar')
   end
-end
+end

spec/views/admin/rooms/index.html.haml_spec.rb

@@ -9,4 +9,4 @@ describe 'admin/rooms/index' do
     expect(rendered).to include('4')
   end
 
-end
+end