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
path: root/app/views
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-09-21 21:52:13 +0300
committerRobert Speicher <robert@gitlab.com>2015-09-21 21:52:13 +0300
commitd4a960161eecf5730b56d3f375573fa39aa67e95 (patch)
tree543dacf2fb1a37e77c4ae91cf935015e2d9f410f /app/views
parent534e548d4495e2193af6542ca8d62e7d5a3a223b (diff)
parent017219e7f548936ce348eeb445dc4717896902ec (diff)
Merge branch 'rename-reply-by-email' into 'master'
Rename reply_by_email to incoming_email to prepare for the future. Closes #2579. See merge request !1367
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/dashboard/index.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 54191aadda6..8657d2c71fe 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -58,7 +58,7 @@
%p
Reply by email
%span.light.pull-right
- = boolean_to_icon Gitlab::ReplyByEmail.enabled?
+ = boolean_to_icon Gitlab::IncomingEmail.enabled?
.col-md-4
%h4
Components