Commit ebe9c890 authored by Douwe Maan's avatar Douwe Maan
Browse files

Consistently refer to MRs as either Accepted or Rejected.

parent 84cb0dcb
......@@ -7,6 +7,7 @@ v 7.12.0 (unreleased)
- Update Asciidoctor gem to version 1.5.2. (Jakub Jirutka)
- Fix resolving of relative links to repository files in AsciiDoc documents. (Jakub Jirutka)
- Use the user list from the target project in a merge request (Stan Hu)
- Consistently refer to MRs as either Accepted or Rejected.
v 7.11.2
- no changes
......
......@@ -133,7 +133,7 @@ class MergeRequest < ActiveRecord::Base
# Closed scope for merge request should return
# both merged and closed mr's
scope :closed, -> { with_states(:closed, :merged) }
scope :declined, -> { with_states(:closed) }
scope :rejected, -> { with_states(:closed) }
def validate_branches
if target_project == source_project && target_branch == source_branch
......
......@@ -10,11 +10,11 @@
- if merge_request.merged?
%span
%i.fa.fa-check
MERGED
ACCEPTED
- elsif merge_request.closed?
%span
%i.fa.fa-close
CLOSED
%i.fa.fa-ban
REJECTED
- else
%span.hidden-xs.hidden-sm
%span.label-branch<
......
%h4.page-title
.issue-box{ class: issue_box_class(@merge_request) }
- if @merge_request.merged?
Merged
Accepted
- elsif @merge_request.closed?
Closed
Rejected
- else
Open
= "Merge Request ##{@merge_request.iid}"
......
......@@ -11,7 +11,7 @@
- if @merge_request.closed?
%h4
Closed
Rejected
- if @merge_request.closed_event
by #{link_to_member(@project, @merge_request.closed_event.author, avatar: false)}
#{time_ago_with_tooltip(@merge_request.closed_event.created_at)}
......@@ -19,7 +19,7 @@
- if @merge_request.merged?
%h4
Merged
Accepted
- if @merge_request.merge_event
by #{link_to_member(@project, @merge_request.merge_event.author, avatar: false)}
#{time_ago_with_tooltip(@merge_request.merge_event.created_at)}
......
......@@ -85,10 +85,10 @@
.col-md-3
= render('merge_requests', title: 'Waiting for merge (open and assigned)', merge_requests: @merge_requests.opened.assigned, id: 'ongoing')
.col-md-3
= render('merge_requests', title: 'Declined (closed)', merge_requests: @merge_requests.declined, id: 'closed')
= render('merge_requests', title: 'Rejected (closed)', merge_requests: @merge_requests.rejected, id: 'closed')
.col-md-3
.panel.panel-primary
.panel-heading Merged
.panel-heading Accepted
%ul.well-list
- @merge_requests.merged.each do |merge_request|
= render 'merge_request', merge_request: merge_request
......
......@@ -11,6 +11,6 @@
#{merge_request.project.name_with_namespace}
.pull-right
- if merge_request.merged?
%span.label.label-primary Merged
%span.label.label-primary Accepted
- elsif merge_request.closed?
%span.label.label-danger Closed
%span.label.label-danger Rejected
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment