diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-30 13:20:15 +0200 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-07-08 11:04:04 +0200 |
commit | c6f9a1c273beb7e427da1e384ed27e323d6f3b29 (patch) | |
tree | 9f2c94e7975c11870c2cca1bcfbe6d1dd169563a /app | |
parent | 2c650b6f30d2e76cf632d6ce5771859aed67ac48 (diff) | |
download | gitlab-ce-c6f9a1c273beb7e427da1e384ed27e323d6f3b29.tar.gz |
Enable Style/IdenticalConditionalBranches Rubocop cop
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/projects_controller.rb | 4 | ||||
-rw-r--r-- | app/models/project_services/irker_service.rb | 4 | ||||
-rw-r--r-- | app/services/merge_requests/refresh_service.rb | 11 |
3 files changed, 7 insertions, 12 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 12e0d5a8413..1803aa8eab4 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -53,11 +53,11 @@ class ProjectsController < Projects::ApplicationController notice: "Project '#{@project.name}' was successfully updated." ) end - format.js else format.html { render 'edit' } - format.js end + + format.js end end diff --git a/app/models/project_services/irker_service.rb b/app/models/project_services/irker_service.rb index 58cb720c3c1..7fc33689952 100644 --- a/app/models/project_services/irker_service.rb +++ b/app/models/project_services/irker_service.rb @@ -114,13 +114,13 @@ class IrkerService < Service if uri.is_a?(URI) && uri.scheme[/^ircs?\z/] && !uri.path.nil? # Do not authorize irc://domain.com/ if uri.fragment.nil? && uri.path.length > 1 - uri.to_s else # Authorize irc://domain.com/smthg#chan # The irker daemon will deal with it by concatenating smthg and # chan, thus sending messages on #smthgchan - uri.to_s end + + uri.to_s end end end diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb index 21490ac77ea..b11ecd97a57 100644 --- a/app/services/merge_requests/refresh_service.rb +++ b/app/services/merge_requests/refresh_service.rb @@ -61,19 +61,14 @@ module MergeRequests merge_requests.each do |merge_request| if merge_request.source_branch == @branch_name || force_push? merge_request.reload_diff - merge_request.mark_as_unchecked else mr_commit_ids = merge_request.commits.map(&:id) push_commit_ids = @commits.map(&:id) matches = mr_commit_ids & push_commit_ids - - if matches.any? - merge_request.reload_diff - merge_request.mark_as_unchecked - else - merge_request.mark_as_unchecked - end + merge_request.reload_diff if matches.any? end + + merge_request.mark_as_unchecked end end |