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/helpers | |
| 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/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9889c995c74..0b46db4b1c3 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -281,10 +281,9 @@ module ApplicationHelper def state_filters_text_for(entity, project) titles = { - opened: "Open", - merged: "Accepted" + opened: "Open" } - + entity_title = titles[entity] || entity.to_s.humanize count = |