gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2986 from openSUSE/depfu/update/rubocop-rspec-2.10.0

Browse source 
Update rubocop-rspec: 2.4.0 → 2.10.0 (minor)
This commit is contained in:
Henne Vogelsang 2022-05-09 12:23:04 +02:00 • committed by GitHub
commit 83c31ed50a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 59 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/helpers/application_helper.rb
View file

@ -116,7 +116,7 @@ module ApplicationHelper
end
def sign_in_path
if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
new_user_ichain_session_path
else
new_user_session_path
@ -140,9 +140,7 @@ module ApplicationHelper
def nav_root_link_for(conference)
link_text = (
conference.try(:organization).try(:name) ||
ENV['OSEM_NAME'] ||
'OSEM'
conference.try(:organization).try(:name) || ENV.fetch('OSEM_NAME', 'OSEM')
)
link_to(
link_text,

2
app/helpers/users_helper.rb
View file

@ -19,7 +19,7 @@ module UsersHelper
unless Rails.application.secrets.send(provider_key).blank? || Rails.application.secrets.send(provider_secret).blank?
providers << provider
end
providers << provider if !ENV["OSEM_#{provider.upcase}_KEY"].blank? && !ENV["OSEM_#{provider.upcase}_SECRET"].blank?
providers << provider if ENV.fetch("OSEM_#{provider.upcase}_KEY", nil).present? && ENV.fetch("OSEM_#{provider.upcase}_SECRET", nil).present?
end
providers.uniq

2
app/models/ability.rb
View file

@ -42,7 +42,7 @@ class Ability
can [:index, :show], Survey, surveyable_type: 'Conference'
# Things that are possible without ichain enabled that are **not*+ possible with ichain mode enabled.
if ENV['OSEM_ICHAIN_ENABLED'] != 'true'
if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) != 'true'
# There is no reliable way for this workflow (enable not logged in users to fill out a form, then telling
# them to sign up once they submit) in ichain. So enable it only without ichain.

2
app/models/admin_ability.rb
View file

@ -51,7 +51,7 @@ class AdminAbility
# for admins
can :manage, :all if user.is_admin
# even admin cannot create new users with ICHAIN enabled
cannot [:new, :create], User if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
cannot [:new, :create], User if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
cannot :revert_object, PaperTrail::Version do |version|
(version.event == 'create' && %w[Conference User Event].include?(version.item_type))
end

8
app/models/email_settings.rb
View file

@ -13,12 +13,12 @@ class EmailSettings < ApplicationRecord
'conference_start_date' => conference.start_date,
'conference_end_date' => conference.end_date,
'registrationlink' => Rails.application.routes.url_helpers.conference_conference_registration_url(
conference.short_title, host: (ENV['OSEM_HOSTNAME'] || 'localhost:3000')),
conference.short_title, host: ENV.fetch('OSEM_HOSTNAME', 'localhost:3000')),
'conference_splash_link' => Rails.application.routes.url_helpers.conference_url(
conference.short_title, host: (ENV['OSEM_HOSTNAME'] || 'localhost:3000')),
conference.short_title, host: ENV.fetch('OSEM_HOSTNAME', 'localhost:3000')),
'schedule_link' => Rails.application.routes.url_helpers.conference_schedule_url(
conference.short_title, host: (ENV['OSEM_HOSTNAME'] || 'localhost:3000'))
conference.short_title, host: ENV.fetch('OSEM_HOSTNAME', 'localhost:3000'))
}
if conference.program.cfp
@ -45,7 +45,7 @@ class EmailSettings < ApplicationRecord
if event
h['eventtitle'] = event.title
h['proposalslink'] = Rails.application.routes.url_helpers.conference_program_proposals_url(
conference.short_title, host: (ENV['OSEM_HOSTNAME'] || 'localhost:3000'))
conference.short_title, host: ENV.fetch('OSEM_HOSTNAME', 'localhost:3000'))
end
if booth

2
app/models/user.rb
View file

@ -51,7 +51,7 @@ class User < ApplicationRecord
# :lockable, :timeoutable and :omniauthable
devise_modules = []
devise_modules += if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
devise_modules += if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
[:ichain_authenticatable, :ichain_registerable, :omniauthable, omniauth_providers: []]
else
[:database_authenticatable, :registerable,

2
app/views/conference_registrations/edit.html.haml
View file

@ -11,7 +11,7 @@
%legend
%span
=link_to('#signup', role: 'tab', "aria-controls" => "home", "data-toggle" => "tab") do
= ENV['OSEM_NAME'] || 'OSEM'
= ENV.fetch('OSEM_NAME', 'OSEM')
Account
%span.pull-right#account-already
=link_to('#signin', role: 'tab', "aria-controls" => "home", "data-toggle" => "tab") do

2
app/views/conference_registrations/new.html.haml
View file

@ -11,7 +11,7 @@
%legend
%span
=link_to('#signup', role: 'tab', "aria-controls" => "home", "data-toggle" => "tab") do
= ENV['OSEM_NAME'] || 'OSEM'
= ENV.fetch('OSEM_NAME', 'OSEM')
Account
%span.pull-right#account-already
=link_to('#signin', role: 'tab', "aria-controls" => "home", "data-toggle" => "tab") do

2
app/views/conferences/new_install.html.haml
View file

@ -9,7 +9,7 @@
installation!
%p
The first user to
- if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
- if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
= link_to(new_ichain_registration_path('user')) do
sign up
- else

2
app/views/conferences/show.html.haml
View file

@ -1,6 +1,6 @@
- content_for :head do
%meta{ property: "og:title", content: @conference.title }
%meta{ property: "og:site_name", content: (ENV['OSEM_NAME'] || 'OSEM') }
%meta{ property: "og:site_name", content: ENV.fetch('OSEM_NAME', 'OSEM') }
%meta{ property: "og:description", content: @conference.description }
%meta{ property: "og:url", content: conference_url(@conference.short_title) }
%meta{ property: "twitter:title", content: (@conference.title) }

2
app/views/devise/sessions/_new_embedded.html.haml
View file

@ -1,4 +1,4 @@
- if ENV['OSEM_ICHAIN_ENABLED'] != 'true'
- if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) != 'true'
= form_tag(new_user_session_path, class: 'form-horizontal') do
%legend
%span

2
app/views/layouts/_admin_sidebar_index.html.haml
View file

@ -37,7 +37,7 @@
= link_to(admin_revision_history_path) do
%span.fa.fa-history
Revision History
- if ENV['ORGANIZATIONS_ENABLED'] == 'true'
- if ENV.fetch('ORGANIZATIONS_ENABLED', nil) == 'true'
%li
= link_to(admin_organizations_path) do
%span.fa.fa-group

4
app/views/layouts/_navigation.html.haml
View file

@ -32,7 +32,7 @@
= render 'layouts/user_menu'
- else
%ul.nav.navbar-nav.navbar-right
- if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
- if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
%li{class: "#{active_nav_li(new_ichain_registration_path('user'))}"}
= link_to(new_ichain_registration_path('user')) do
%span.fa.fa-heart
@ -48,7 +48,7 @@
Sign In
%span.caret
.dropdown-menu
- if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
- if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
= form_tag User.ichain_login_url do
= text_field_tag 'username', nil, id: 'user_ichain_email_dd', class: 'form-control', placeholder: 'Username'
= password_field_tag 'password', nil, id: 'user_ichain_password_dd', class: 'form-control', placeholder: 'Password'

6
app/views/layouts/_user_menu.html.haml
View file

@ -10,7 +10,7 @@
%li= link_to "See all unread Comments (#{unread_notifications(current_user).length})", admin_comments_path
%li= link_to 'See all Comments', admin_comments_path(anchor: 'all_comments')
%li.divider
- unless ENV['OSEM_ICHAIN_ENABLED'] == 'true'
- unless ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
%li
= link_to(edit_user_registration_path) do
%span.fa.fa-wrench
@ -40,7 +40,7 @@
%span.fa.fa-shopping-bag
My #{(t'booth').capitalize } Requests
%li
- if ENV['OSEM_ICHAIN_ENABLED'] == 'true'
- if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
= link_to(destroy_user_ichain_session_path, method: 'delete') do
%span.fa.fa-minus
Sign out
@ -76,7 +76,7 @@
= link_to(admin_revision_history_path) do
%span.fa.fa-history
Revision History
- if ENV['ORGANIZATIONS_ENABLED'] == 'true'
- if ENV.fetch('OSEM_ICHAIN_ENABLED', nil) == 'true'
%li
= link_to(admin_organizations_path) do
%span.fa.fa-group

6
app/views/layouts/application.html.haml
View file

@ -2,7 +2,7 @@
%head
%meta{charset: 'utf-8'}
%meta{name: 'viewport', content: 'width=device-width, initial-scale=1, maximum-scale=1'}
%title= content_for?(:title) ? yield(:title) : (ENV['OSEM_NAME'] || 'OSEM')
%title= content_for?(:title) ? yield(:title) : ENV.fetch('OSEM_NAME', 'OSEM')
%meta{content: '', name: 'description'}
%meta{content: '', name: 'author'}
= stylesheet_link_tag "application", media: 'all'
@ -10,7 +10,7 @@
= csrf_meta_tags
= content_for(:script_head)
- if ENV['OSEM_TRANSIFEX_APIKEY']
- if ENV.fetch('OSEM_TRANSIFEX_APIKEY', nil)
:javascript
window.liveSettings = {
api_key: "#{ENV['OSEM_TRANSIFEX_APIKEY']}",
@ -46,7 +46,7 @@
You can run, copy, distribute, study, change and improve it.
The source code and the developers are on
#{link_to "GitHub", "https://github.com/openSUSE/osem"}.
- if ENV["SKYLIGHT_PUBLIC_DASHBOARD_URL"].present?
- if ENV.fetch('SKYLIGHT_PUBLIC_DASHBOARD_URL', nil)
Performance data is available on
#{link_to "Skylight", ENV["SKYLIGHT_PUBLIC_DASHBOARD_URL"]}.
= yield :script_body

2
app/views/payments/_payment.html.haml
View file

@ -22,6 +22,6 @@
= form_tag conference_payments_path do
%script.stripe-button{ src: "https://checkout.stripe.com/checkout.js",
data: { amount: @total_amount_to_pay.cents, label: "Pay #{humanized_money_with_symbol @total_amount_to_pay}",
email: current_user.email, currency: @total_amount_to_pay.currency, name: ENV['OSEM_NAME'] || 'OSEM',
email: current_user.email, currency: @total_amount_to_pay.currency, name: ENV.fetch('OSEM_NAME', 'OSEM'),
description: "book your tickets", key: Rails.application.secrets.stripe_publishable_key, locale: "auto"}}
= link_to 'Edit Purchase', conference_tickets_path(@conference.short_title), class: 'btn btn-default'

2
app/views/proposals/new.html.haml
View file

@ -17,7 +17,7 @@
%legend
%span
=link_to('#signup', role: 'tab', 'aria-controls' => 'home', 'data-toggle' => 'tab') do
= ENV['OSEM_NAME'] || 'OSEM'
= ENV.fetch('OSEM_NAME', 'OSEM')
Account
%span.pull-right#account-already
=link_to('#signin', role: 'tab', 'aria-controls' => 'home', 'data-toggle' => 'tab') do

2
app/views/proposals/show.html.haml
View file

@ -2,7 +2,7 @@
%meta{ property: "og:title", content: @event.title }
%meta{ property: "og:url", content: conference_program_proposal_url(@conference.short_title, @event) }
%meta{ property: "og:description", content: @event.abstract }
%meta{ property: "og:site_name", content: (ENV['OSEM_NAME'] || 'OSEM') }
%meta{ property: "og:site_name", content: ENV.fetch('OSEM_NAME', 'OSEM') }
- if @speakers_ordered.any?
%meta{ property: "og:image", content: @speakers_ordered.first.gravatar_url }
%meta{ property: "og:image:secure_url", content: @speakers_ordered.first.gravatar_url }