From 6e7e0c2cd36f5e914e2119eed839aeab466bb855 Mon Sep 17 00:00:00 2001
From: Artem Chernikov <skullzeek@gmail.com>
Date: Wed, 30 Jul 2014 23:37:50 +0200
Subject: [PATCH] Style/BracesAroundHashParameters enabled

---
 .rubocop.yml                           | 4 ++++
 app/controllers/schedule_controller.rb | 2 +-
 config/initializers/devise.rb          | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 82c8d3e4..a76eda33 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -100,6 +100,10 @@ Style/BlockNesting:
 Style/Blocks:
   Enabled: true
 
+# avoid redundunt curly braces when it is obvious that hash is used
+Style/BracesAroundHashParameters:
+  Enabled: true
+
 AllCops:
   Include:
     - '**/Rakefile'
diff --git a/app/controllers/schedule_controller.rb b/app/controllers/schedule_controller.rb
index 365d8bf2..2e3bc96e 100644
--- a/app/controllers/schedule_controller.rb
+++ b/app/controllers/schedule_controller.rb
@@ -2,7 +2,7 @@ class ScheduleController < ApplicationController
   layout "application"
   
   def index
-    @conference = Conference.includes(:rooms, {events: [:speakers, :track, :event_type]}).where("conferences.short_title" => params[:conference_id]).first
+    @conference = Conference.includes(:rooms, events: [:speakers, :track, :event_type]).where("conferences.short_title" => params[:conference_id]).first
     @rooms = @conference.rooms
     @events = @conference.events
     @dates = @conference.start_date..@conference.end_date
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index a71d3cdd..99546161 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -10,9 +10,9 @@ Devise.setup do |config|
   # Pass each provider to User model in :omniauth_providers (for open_id providers use their name)
 
   config.omniauth :open_id, name: 'novell', identifier: 'http://www.opensuse.org/openid/user'
-  config.omniauth :google_oauth2, Rails.application.secrets.google_key, Rails.application.secrets.google_secret, {
-    name: 'google',
-    scope: 'email' }
+  config.omniauth :google_oauth2, Rails.application.secrets.google_key, Rails.application.secrets.google_secret, 
+                  name: 'google',
+                  scope: 'email' 
   config.omniauth :facebook, Rails.application.secrets.facebook_key, Rails.application.secrets.facebook_secret
 
   # ==> Mailer Configuration