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:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-18 20:15:17 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-19 18:09:50 +0300
commit7524d7c0822b9aef962163272874e648ef3bdcff (patch)
treef193726aa96f41442e7bfd01fcb74bdda224e000 /app/helpers
parent74a6732c0dfc1416cad382203544d9c4d6246f58 (diff)
Revert merge request states renaming
Replaced: * "Accepted" with "Merged" * "Rejected" with "Closed" Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/application_helper.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 10d7aa11209..5389680fca5 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -295,10 +295,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 =