diff options
| author | Alexander Vagin <laplugin73@gmail.com> | 2013-12-04 11:02:36 +0300 |
|---|---|---|
| committer | Alexander Vagin <laplugin73@gmail.com> | 2013-12-04 11:02:36 +0300 |
| commit | 6f0725119c87efaab0b97953c02499678ae48ea2 (patch) | |
| tree | 8dcaf833849b9d63ace070082a3ef0677cfabe64 /app/helpers/compare_helper.rb | |
| parent | a4cbdbb10dc692d95407944ef6f0769700ac5ba3 (diff) | |
| download | gitlab-ce-6f0725119c87efaab0b97953c02499678ae48ea2.tar.gz | |
Fix bug with showing create merge request button while merge request are disabled in project settings
Diffstat (limited to 'app/helpers/compare_helper.rb')
| -rw-r--r-- | app/helpers/compare_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/compare_helper.rb b/app/helpers/compare_helper.rb index ea2540bf385..5ff19b88293 100644 --- a/app/helpers/compare_helper.rb +++ b/app/helpers/compare_helper.rb @@ -1,6 +1,8 @@ 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] && |