Style/BracesAroundHashParameters enabled
This commit is contained in:
parent
99f773a040
commit
6e7e0c2cd3
3 changed files with 8 additions and 4 deletions
|
|
@ -100,6 +100,10 @@ Style/BlockNesting:
|
||||||
Style/Blocks:
|
Style/Blocks:
|
||||||
Enabled: true
|
Enabled: true
|
||||||
|
|
||||||
|
# avoid redundunt curly braces when it is obvious that hash is used
|
||||||
|
Style/BracesAroundHashParameters:
|
||||||
|
Enabled: true
|
||||||
|
|
||||||
AllCops:
|
AllCops:
|
||||||
Include:
|
Include:
|
||||||
- '**/Rakefile'
|
- '**/Rakefile'
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ class ScheduleController < ApplicationController
|
||||||
layout "application"
|
layout "application"
|
||||||
|
|
||||||
def index
|
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
|
@rooms = @conference.rooms
|
||||||
@events = @conference.events
|
@events = @conference.events
|
||||||
@dates = @conference.start_date..@conference.end_date
|
@dates = @conference.start_date..@conference.end_date
|
||||||
|
|
|
||||||
|
|
@ -10,9 +10,9 @@ Devise.setup do |config|
|
||||||
# Pass each provider to User model in :omniauth_providers (for open_id providers use their name)
|
# 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 :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, {
|
config.omniauth :google_oauth2, Rails.application.secrets.google_key, Rails.application.secrets.google_secret,
|
||||||
name: 'google',
|
name: 'google',
|
||||||
scope: 'email' }
|
scope: 'email'
|
||||||
config.omniauth :facebook, Rails.application.secrets.facebook_key, Rails.application.secrets.facebook_secret
|
config.omniauth :facebook, Rails.application.secrets.facebook_key, Rails.application.secrets.facebook_secret
|
||||||
|
|
||||||
# ==> Mailer Configuration
|
# ==> Mailer Configuration
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue