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>2012-01-28 18:47:55 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-01-28 18:47:55 +0400
commit0a4222fb9802aa979171920c489a7db11e3f1ff8 (patch)
tree6e33739801334cdf835715e0c11d1d37adff68c8 /app/helpers/dashboard_helper.rb
parent15b06b01644f31314f3241afbb7a807219f18703 (diff)
Bootstrap: Activities
Diffstat (limited to 'app/helpers/dashboard_helper.rb')
-rw-r--r--app/helpers/dashboard_helper.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb
index 5cf1027854d..55ed901c210 100644
--- a/app/helpers/dashboard_helper.rb
+++ b/app/helpers/dashboard_helper.rb
@@ -3,6 +3,7 @@ module DashboardHelper
case object.class.name.to_s
when "Issue" then project_issue_path(project, project.issues.find(object.id))
when "Commit" then project_commit_path(project, project.repo.commits(object.id).first)
+ when "MergeRequest" then project_merge_request_path(project, object.id)
when "Note"
then
note = object
@@ -26,6 +27,7 @@ module DashboardHelper
when "Note" then markdown(object.note)
when "Issue" then object.title
when "Commit" then object.safe_message
+ when "MergeRequest" then object.title
else return "Project Wall"
end