Commit 4f6e067e authored by Robert Speicher's avatar Robert Speicher

Merge branch 'dm-no-more-andor' into 'master'

No more and/or

See merge request !9428
parents 7c617fcc f40716f4
...@@ -54,6 +54,11 @@ Style/AlignArray: ...@@ -54,6 +54,11 @@ Style/AlignArray:
Style/AlignHash: Style/AlignHash:
Enabled: true Enabled: true
# Whether `and` and `or` are banned only in conditionals (conditionals)
# or completely (always).
Style/AndOr:
Enabled: true
# Use `Array#join` instead of `Array#*`. # Use `Array#join` instead of `Array#*`.
Style/ArrayJoin: Style/ArrayJoin:
Enabled: true Enabled: true
......
...@@ -180,13 +180,6 @@ Security/JSONLoad: ...@@ -180,13 +180,6 @@ Security/JSONLoad:
Style/AlignParameters: Style/AlignParameters:
Enabled: false Enabled: false
# Offense count: 27
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
# SupportedStyles: always, conditionals
Style/AndOr:
Enabled: false
# Offense count: 54 # Offense count: 54
# Cop supports --auto-correct. # Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles. # Configuration parameters: EnforcedStyle, SupportedStyles.
......
...@@ -74,7 +74,7 @@ class ApplicationController < ActionController::Base ...@@ -74,7 +74,7 @@ class ApplicationController < ActionController::Base
def authenticate_user!(*args) def authenticate_user!(*args)
if redirect_to_home_page_url? if redirect_to_home_page_url?
redirect_to current_application_settings.home_page_url and return return redirect_to current_application_settings.home_page_url
end end
super(*args) super(*args)
...@@ -131,7 +131,7 @@ class ApplicationController < ActionController::Base ...@@ -131,7 +131,7 @@ class ApplicationController < ActionController::Base
headers['X-UA-Compatible'] = 'IE=edge' headers['X-UA-Compatible'] = 'IE=edge'
headers['X-Content-Type-Options'] = 'nosniff' headers['X-Content-Type-Options'] = 'nosniff'
# Enabling HSTS for non-standard ports would send clients to the wrong port # Enabling HSTS for non-standard ports would send clients to the wrong port
if Gitlab.config.gitlab.https and Gitlab.config.gitlab.port == 443 if Gitlab.config.gitlab.https && Gitlab.config.gitlab.port == 443
headers['Strict-Transport-Security'] = 'max-age=31536000' headers['Strict-Transport-Security'] = 'max-age=31536000'
end end
end end
...@@ -152,7 +152,7 @@ class ApplicationController < ActionController::Base ...@@ -152,7 +152,7 @@ class ApplicationController < ActionController::Base
def check_password_expiration def check_password_expiration
if current_user && current_user.password_expires_at && current_user.password_expires_at < Time.now && !current_user.ldap_user? if current_user && current_user.password_expires_at && current_user.password_expires_at < Time.now && !current_user.ldap_user?
redirect_to new_profile_password_path and return return redirect_to new_profile_password_path
end end
end end
...@@ -218,7 +218,7 @@ class ApplicationController < ActionController::Base ...@@ -218,7 +218,7 @@ class ApplicationController < ActionController::Base
def require_email def require_email
if current_user && current_user.temp_oauth_email? && session[:impersonator_id].nil? if current_user && current_user.temp_oauth_email? && session[:impersonator_id].nil?
redirect_to profile_path, notice: 'Please complete your profile with email address' and return return redirect_to profile_path, notice: 'Please complete your profile with email address'
end end
end end
......
...@@ -29,7 +29,7 @@ class Import::FogbugzController < Import::BaseController ...@@ -29,7 +29,7 @@ class Import::FogbugzController < Import::BaseController
unless user_map.is_a?(Hash) && user_map.all? { |k, v| !v[:name].blank? } unless user_map.is_a?(Hash) && user_map.all? { |k, v| !v[:name].blank? }
flash.now[:alert] = 'All users must have a name.' flash.now[:alert] = 'All users must have a name.'
render 'new_user_map' and return return render 'new_user_map'
end end
session[:fogbugz_user_map] = user_map session[:fogbugz_user_map] = user_map
......
...@@ -44,13 +44,13 @@ class Import::GoogleCodeController < Import::BaseController ...@@ -44,13 +44,13 @@ class Import::GoogleCodeController < Import::BaseController
rescue rescue
flash.now[:alert] = "The entered user map is not a valid JSON user map." flash.now[:alert] = "The entered user map is not a valid JSON user map."
render "new_user_map" and return return render "new_user_map"
end end
unless user_map.is_a?(Hash) && user_map.all? { |k, v| k.is_a?(String) && v.is_a?(String) } unless user_map.is_a?(Hash) && user_map.all? { |k, v| k.is_a?(String) && v.is_a?(String) }
flash.now[:alert] = "The entered user map is not a valid JSON user map." flash.now[:alert] = "The entered user map is not a valid JSON user map."
render "new_user_map" and return return render "new_user_map"
end end
# This is the default, so let's not save it into the database. # This is the default, so let's not save it into the database.
......
...@@ -42,9 +42,7 @@ class InvitesController < ApplicationController ...@@ -42,9 +42,7 @@ class InvitesController < ApplicationController
@token = params[:id] @token = params[:id]
@member = Member.find_by_invite_token(@token) @member = Member.find_by_invite_token(@token)
unless @member return render_404 unless @member
render_404 and return
end
@member @member
end end
......
...@@ -122,7 +122,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController ...@@ -122,7 +122,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
else else
error_message = @user.errors.full_messages.to_sentence error_message = @user.errors.full_messages.to_sentence
redirect_to omniauth_error_path(oauth['provider'], error: error_message) and return return redirect_to omniauth_error_path(oauth['provider'], error: error_message)
end end
end end
......
...@@ -45,13 +45,13 @@ class Profiles::KeysController < Profiles::ApplicationController ...@@ -45,13 +45,13 @@ class Profiles::KeysController < Profiles::ApplicationController
if user.present? if user.present?
render text: user.all_ssh_keys.join("\n"), content_type: "text/plain" render text: user.all_ssh_keys.join("\n"), content_type: "text/plain"
else else
render_404 and return return render_404
end end
rescue => e rescue => e
render text: e.message render text: e.message
end end
else else
render_404 and return return render_404
end end
end end
......
...@@ -95,7 +95,7 @@ class Projects::BlobController < Projects::ApplicationController ...@@ -95,7 +95,7 @@ class Projects::BlobController < Projects::ApplicationController
else else
if tree = @repository.tree(@commit.id, @path) if tree = @repository.tree(@commit.id, @path)
if tree.entries.any? if tree.entries.any?
redirect_to namespace_project_tree_path(@project.namespace, @project, File.join(@ref, @path)) and return return redirect_to namespace_project_tree_path(@project.namespace, @project, File.join(@ref, @path))
end end
end end
......
...@@ -15,10 +15,10 @@ class Projects::TreeController < Projects::ApplicationController ...@@ -15,10 +15,10 @@ class Projects::TreeController < Projects::ApplicationController
if tree.entries.empty? if tree.entries.empty?
if @repository.blob_at(@commit.id, @path) if @repository.blob_at(@commit.id, @path)
redirect_to( return redirect_to(
namespace_project_blob_path(@project.namespace, @project, namespace_project_blob_path(@project.namespace, @project,
File.join(@ref, @path)) File.join(@ref, @path))
) and return )
elsif @path.present? elsif @path.present?
return render_404 return render_404
end end
......
...@@ -23,7 +23,7 @@ class SnippetsController < ApplicationController ...@@ -23,7 +23,7 @@ class SnippetsController < ApplicationController
if params[:username].present? if params[:username].present?
@user = User.find_by(username: params[:username]) @user = User.find_by(username: params[:username])
render_404 and return unless @user return render_404 unless @user
@snippets = SnippetsFinder.new.execute(current_user, { @snippets = SnippetsFinder.new.execute(current_user, {
filter: :by_user, filter: :by_user,
......
...@@ -552,7 +552,7 @@ class Project < ActiveRecord::Base ...@@ -552,7 +552,7 @@ class Project < ActiveRecord::Base
end end
def check_limit def check_limit
unless creator.can_create_project? or namespace.kind == 'group' unless creator.can_create_project? || namespace.kind == 'group'
projects_limit = creator.projects_limit projects_limit = creator.projects_limit
if projects_limit == 0 if projects_limit == 0
......
...@@ -52,7 +52,7 @@ class DroneCiService < CiService ...@@ -52,7 +52,7 @@ class DroneCiService < CiService
response = HTTParty.get(commit_status_path(sha, ref), verify: enable_ssl_verification) response = HTTParty.get(commit_status_path(sha, ref), verify: enable_ssl_verification)
status = status =
if response.code == 200 and response['status'] if response.code == 200 && response['status']
case response['status'] case response['status']
when 'killed' when 'killed'
:canceled :canceled
......
...@@ -96,7 +96,7 @@ class IrkerService < Service ...@@ -96,7 +96,7 @@ class IrkerService < Service
rescue URI::InvalidURIError rescue URI::InvalidURIError
end end
unless uri.present? and default_irc_uri.nil? unless uri.present? && default_irc_uri.nil?
begin begin
new_recipient = URI.join(default_irc_uri, '/', recipient).to_s new_recipient = URI.join(default_irc_uri, '/', recipient).to_s
uri = consider_uri(URI.parse(new_recipient)) uri = consider_uri(URI.parse(new_recipient))
......
...@@ -5,7 +5,7 @@ module Projects ...@@ -5,7 +5,7 @@ module Projects
end end
def execute def execute
return nil unless @file and @file.size <= max_attachment_size return nil unless @file && @file.size <= max_attachment_size
uploader = FileUploader.new(@project) uploader = FileUploader.new(@project)
uploader.store!(@file) uploader.store!(@file)
......
...@@ -31,7 +31,7 @@ if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter) ...@@ -31,7 +31,7 @@ if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
end end
def add_index_options(table_name, column_name, options = {}) def add_index_options(table_name, column_name, options = {})
if options[:using] and options[:using] == :gin if options[:using] && options[:using] == :gin
options = options.dup options = options.dup
options.delete(:using) options.delete(:using)
end end
......
# The default colors of rack-lineprof can be very hard to look at in terminals # The default colors of rack-lineprof can be very hard to look at in terminals
# with darker backgrounds. This patch tweaks the colors a bit so the output is # with darker backgrounds. This patch tweaks the colors a bit so the output is
# actually readable. # actually readable.
if Rails.env.development? and RUBY_ENGINE == 'ruby' and ENV['ENABLE_LINEPROF'] if Rails.env.development? && RUBY_ENGINE == 'ruby' && ENV['ENABLE_LINEPROF']
Rails.application.config.middleware.use(Rack::Lineprof) Rails.application.config.middleware.use(Rack::Lineprof)
module Rack module Rack
......
constraint = lambda { |request| request.env['warden'].authenticate? and request.env['warden'].user.admin? } constraint = lambda { |request| request.env['warden'].authenticate? && request.env['warden'].user.admin? }
constraints constraint do constraints constraint do
mount Sidekiq::Web, at: '/admin/sidekiq', as: :sidekiq mount Sidekiq::Web, at: '/admin/sidekiq', as: :sidekiq
end end
...@@ -153,7 +153,7 @@ module API ...@@ -153,7 +153,7 @@ module API
params_hash = custom_params || params params_hash = custom_params || params
attrs = {} attrs = {}
keys.each do |key| keys.each do |key|
if params_hash[key].present? or (params_hash.has_key?(key) and params_hash[key] == false) if params_hash[key].present? || (params_hash.has_key?(key) && params_hash[key] == false)
attrs[key] = params_hash[key] attrs[key] = params_hash[key]
end end
end end
......
...@@ -7,7 +7,7 @@ module Banzai ...@@ -7,7 +7,7 @@ module Banzai
# #
class PlantumlFilter < HTML::Pipeline::Filter class PlantumlFilter < HTML::Pipeline::Filter
def call def call
return doc unless doc.at('pre.plantuml') and settings.plantuml_enabled return doc unless doc.at('pre.plantuml') && settings.plantuml_enabled
plantuml_setup plantuml_setup
......
...@@ -126,7 +126,7 @@ module Ci ...@@ -126,7 +126,7 @@ module Ci
# We are only interested in color and text style changes - triggered by # We are only interested in color and text style changes - triggered by
# sequences starting with '\e[' and ending with 'm'. Any other control # sequences starting with '\e[' and ending with 'm'. Any other control
# sequence gets stripped (including stuff like "delete last line") # sequence gets stripped (including stuff like "delete last line")
return unless indicator == '[' and terminator == 'm' return unless indicator == '[' && terminator == 'm'
close_open_tags() close_open_tags()
......
...@@ -11,7 +11,7 @@ module Gitlab ...@@ -11,7 +11,7 @@ module Gitlab
mem = 0 mem = 0
match = File.read('/proc/self/status').match(/VmRSS:\s+(\d+)/) match = File.read('/proc/self/status').match(/VmRSS:\s+(\d+)/)
if match and match[1] if match && match[1]
mem = match[1].to_f * 1024 mem = match[1].to_f * 1024
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment