Fix bug with showing create merge request button while merge request are...

Fix bug with showing create merge request button while merge request are disabled in project settings

Fix bug with showing create merge request button while merge request are...
Fix bug with showing create merge request button while merge request are disabled in project settings
6f072511 · Alexander Vagin · a4cbdbb1 · 6f072511
Commit 6f072511 authored Dec 04, 2013 by Alexander Vagin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

app/helpers/compare_helper.rb app/helpers/compare_helper.rb +3 -1

No files found.
--- a/app/helpers/compare_helper.rb
+++ b/app/helpers/compare_helper.rb
 module CompareHelper
  def compare_to_mr_button?
-    params[:from].present? && params[:to].present? &&
+    @project.merge_requests_enabled &&
+      params[:from].present? && 
+      params[:to].present? &&
      @repository.branch_names.include?(params[:from]) &&
      @repository.branch_names.include?(params[:to]) &&
      params[:from] != params[:to] &&