diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-02-01 21:43:51 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-02-10 10:32:25 -0200 |
| commit | 1353cff5fed083fd7192dddff5062ac383b1f8a0 (patch) | |
| tree | 290a06a1d034ea855e6fa398560a5ce250476eba /app/controllers/projects/commits_controller.rb | |
| parent | 10aa99a30c311c59358d1547ebcbe0f6a92227a7 (diff) | |
| download | gitlab-ce-1353cff5fed083fd7192dddff5062ac383b1f8a0.tar.gz | |
Replaces "Create merge request" link with one to the MR when one exists
Diffstat (limited to 'app/controllers/projects/commits_controller.rb')
| -rw-r--r-- | app/controllers/projects/commits_controller.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb index bf5b54c8cb7..1420b96840c 100644 --- a/app/controllers/projects/commits_controller.rb +++ b/app/controllers/projects/commits_controller.rb @@ -21,6 +21,9 @@ class Projects::CommitsController < Projects::ApplicationController @note_counts = project.notes.where(commit_id: @commits.map(&:id)). group(:commit_id).count + @merge_request = @project.merge_requests.opened. + find_by(source_project: @project, source_branch: @ref, target_branch: @repository.root_ref) + respond_to do |format| format.html format.json { pager_json("projects/commits/_commits", @commits.size) } |