Download as
Browse Code »

Commit 1a0082b46b121b2c7bff0211950adc13855d9344

Authored by Dmitriy Zaporozhets
1 parent 65f0ed4d
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

hime last push widget if user already has MR created

Showing 1 changed file with 14 additions and 6 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @1a0082b
... ... @@ -137,13 +137,21 @@ module ApplicationHelper
137 137 end
138 138 end
139 139  
  140 + # Define whenever show last push event
  141 + # with suggestion to create MR
140 142 def show_last_push_widget?(event)
141   - event &&
142   - event.last_push_to_non_root? &&
143   - !event.rm_ref? &&
144   - event.project &&
145   - event.project.repository &&
146   - event.project.merge_requests_enabled
  143 + # Skip if event is not about added or modified non-master branch
  144 + return false unless event && event.last_push_to_non_root? && !event.rm_ref?
  145 +
  146 + project = event.project
  147 +
  148 + # Skip if project repo is empty or MR disabled
  149 + return false unless project && !project.empty_repo? && project.merge_requests_enabled
  150 +
  151 + # Skip if user already created appropriate MR
  152 + return false if project.merge_requests.where(source_branch: event.branch_name).opened.any?
  153 +
  154 + true
147 155 end
148 156  
149 157 def hexdigest(string)
... ...