Commit c6f9a1c2 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Enable Style/IdenticalConditionalBranches Rubocop cop

parent 2c650b6f
...@@ -284,7 +284,7 @@ Style/IfWithSemicolon: ...@@ -284,7 +284,7 @@ Style/IfWithSemicolon:
# Checks that conditional statements do not have an identical line at the # Checks that conditional statements do not have an identical line at the
# end of each branch, which can validly be moved out of the conditional. # end of each branch, which can validly be moved out of the conditional.
Style/IdenticalConditionalBranches: Style/IdenticalConditionalBranches:
Enabled: false Enabled: true
# Checks the indentation of the first line of the right-hand-side of a # Checks the indentation of the first line of the right-hand-side of a
# multi-line assignment. # multi-line assignment.
......
...@@ -53,11 +53,11 @@ class ProjectsController < Projects::ApplicationController ...@@ -53,11 +53,11 @@ class ProjectsController < Projects::ApplicationController
notice: "Project '#{@project.name}' was successfully updated." notice: "Project '#{@project.name}' was successfully updated."
) )
end end
format.js
else else
format.html { render 'edit' } format.html { render 'edit' }
format.js
end end
format.js
end end
end end
......
...@@ -114,13 +114,13 @@ class IrkerService < Service ...@@ -114,13 +114,13 @@ class IrkerService < Service
if uri.is_a?(URI) && uri.scheme[/^ircs?\z/] && !uri.path.nil? if uri.is_a?(URI) && uri.scheme[/^ircs?\z/] && !uri.path.nil?
# Do not authorize irc://domain.com/ # Do not authorize irc://domain.com/
if uri.fragment.nil? && uri.path.length > 1 if uri.fragment.nil? && uri.path.length > 1
uri.to_s
else else
# Authorize irc://domain.com/smthg#chan # Authorize irc://domain.com/smthg#chan
# The irker daemon will deal with it by concatenating smthg and # The irker daemon will deal with it by concatenating smthg and
# chan, thus sending messages on #smthgchan # chan, thus sending messages on #smthgchan
uri.to_s
end end
uri.to_s
end end
end end
end end
...@@ -61,19 +61,14 @@ module MergeRequests ...@@ -61,19 +61,14 @@ module MergeRequests
merge_requests.each do |merge_request| merge_requests.each do |merge_request|
if merge_request.source_branch == @branch_name || force_push? if merge_request.source_branch == @branch_name || force_push?
merge_request.reload_diff merge_request.reload_diff
merge_request.mark_as_unchecked
else else
mr_commit_ids = merge_request.commits.map(&:id) mr_commit_ids = merge_request.commits.map(&:id)
push_commit_ids = @commits.map(&:id) push_commit_ids = @commits.map(&:id)
matches = mr_commit_ids & push_commit_ids matches = mr_commit_ids & push_commit_ids
merge_request.reload_diff if matches.any?
end
if matches.any?
merge_request.reload_diff
merge_request.mark_as_unchecked merge_request.mark_as_unchecked
else
merge_request.mark_as_unchecked
end
end
end end
end end
......
...@@ -143,18 +143,14 @@ module Rouge ...@@ -143,18 +143,14 @@ module Rouge
'</span>' '</span>'
end end
end end
lines.join("\n") elsif @linenos == 'inline'
else
if @linenos == 'inline'
lines = lines.each_with_index.map do |line, index| lines = lines.each_with_index.map do |line, index|
number = index + @linenostart number = index + @linenostart
"<span class=\"linenos\">#{number}</span>#{line}" "<span class=\"linenos\">#{number}</span>#{line}"
end end
lines.join("\n")
else
lines.join("\n")
end
end end
lines.join("\n")
end end
def span(tok, val) def span(tok, val)
......
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