Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-05-25 18:00:27 +0300
committerDouwe Maan <douwe@gitlab.com>2015-05-25 18:01:14 +0300
commitebe9c89082d1536d3f4c7e2071692277e7957d57 (patch)
treece5e2bdde2036f52db4aaf8f805e2a6587715fc8 /app/views/search
parent84cb0dcbcd361730afcfbc72ea4aa7d9204f12d4 (diff)
Consistently refer to MRs as either Accepted or Rejected.
Diffstat (limited to 'app/views/search')
-rw-r--r--app/views/search/results/_merge_request.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/search/results/_merge_request.html.haml b/app/views/search/results/_merge_request.html.haml
index 2efa616d664..adfdd1c7506 100644
--- a/app/views/search/results/_merge_request.html.haml
+++ b/app/views/search/results/_merge_request.html.haml
@@ -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