diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-22 15:43:09 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-22 15:43:09 +0200 |
| commit | cc9b5c49d1de2a9e1e90895700376793b9d614f6 (patch) | |
| tree | 3e5c1924e14cfa4acc9daddc1f1e7c535e25605f /app/views/projects/merge_requests/_merge_request.html.haml | |
| parent | bcb07929fe7d79be4eab86c7eb0cb0409a736efc (diff) | |
| parent | 967214b2eccc473eaeab45a22e496fefbcfe0841 (diff) | |
| download | gitlab-ce-cc9b5c49d1de2a9e1e90895700376793b9d614f6.tar.gz | |
Merge branch 'revert-mr-state-names'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
features/steps/project/merge_requests.rb
Diffstat (limited to 'app/views/projects/merge_requests/_merge_request.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_merge_request.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index d79c4548247..0bcd543fee7 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -9,11 +9,11 @@ - if merge_request.merged? %span %i.fa.fa-check - ACCEPTED + MERGED - elsif merge_request.closed? %span %i.fa.fa-ban - REJECTED + CLOSED - else %span.hidden-xs.hidden-sm %span.label-branch< |