mirror of
https://github.com/openSUSE/osem.git
synced 2026-08-13 19:54:02 +00:00
Merge pull request #1498 from divyanshumehta/issue_1497
Added Style/SpaceInsideBrackets Rubocop cop
This commit is contained in:
commit
53040b3be9
5 changed files with 8 additions and 11 deletions
|
|
@ -88,6 +88,10 @@ Style/RedundantSelf:
|
|||
Style/SpaceAroundOperators:
|
||||
Enabled: true
|
||||
|
||||
# Checks for spaces inside square brackets.
|
||||
Style/SpaceInsideBrackets:
|
||||
Enabled: true
|
||||
|
||||
# Use single quotes unless there's string interpolation
|
||||
Style/StringLiterals:
|
||||
Enabled: true
|
||||
|
|
|
|||
|
|
@ -813,13 +813,6 @@ Style/SpaceInsideBlockBraces:
|
|||
- 'spec/models/ability_spec.rb'
|
||||
- 'spec/models/user_spec.rb'
|
||||
|
||||
# Offense count: 5
|
||||
# Cop supports --auto-correct.
|
||||
Style/SpaceInsideBrackets:
|
||||
Exclude:
|
||||
- 'app/models/conference.rb'
|
||||
- 'app/models/user.rb'
|
||||
|
||||
# Offense count: 25
|
||||
# Cop supports --auto-correct.
|
||||
# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces.
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ module ApplicationHelper
|
|||
end
|
||||
|
||||
def speaker_links(event)
|
||||
event.speakers.map{ |speaker| link_to speaker.name, admin_user_path(speaker) }.join(', ').html_safe
|
||||
safe_join(event.speakers.map{ |speaker| link_to speaker.name, admin_user_path(speaker) }, ',')
|
||||
end
|
||||
|
||||
def speaker_selector_input(form)
|
||||
|
|
|
|||
|
|
@ -896,7 +896,7 @@ class Conference < ActiveRecord::Base
|
|||
hash[key] = 0
|
||||
end
|
||||
end
|
||||
Hash[ hash.sort ]
|
||||
Hash[hash.sort]
|
||||
end
|
||||
|
||||
##
|
||||
|
|
|
|||
|
|
@ -26,11 +26,11 @@ class User < ActiveRecord::Base
|
|||
devise_modules = []
|
||||
|
||||
if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
|
||||
devise_modules += [ :ichain_authenticatable, :ichain_registerable, :omniauthable, omniauth_providers: [] ]
|
||||
devise_modules += [:ichain_authenticatable, :ichain_registerable, :omniauthable, omniauth_providers: []]
|
||||
else
|
||||
devise_modules += [:database_authenticatable, :registerable,
|
||||
:recoverable, :rememberable, :trackable, :validatable, :confirmable,
|
||||
:omniauthable, omniauth_providers: [:suse, :google, :facebook, :github] ]
|
||||
:omniauthable, omniauth_providers: [:suse, :google, :facebook, :github]]
|
||||
end
|
||||
|
||||
devise(*devise_modules)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue