summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-01-31 14:38:45 -0600
committerMike Greiling <mike@pixelcog.com>2017-01-31 14:38:45 -0600
commit5fcbe12730960e93b1d3afe6be846eb9ef570d32 (patch)
tree79a09bfb5e38f7c366b503d363d561ba98f13799 /app/helpers
parentecdcd1be87e140c144bb2afc861a1dc56b297cdd (diff)
parent2c358b4b5613d6d398533dc559674da14de3c0d7 (diff)
downloadgitlab-ce-5fcbe12730960e93b1d3afe6be846eb9ef570d32.tar.gz
Merge branch 'master' into go-go-gadget-webpack
* master: (83 commits) Fix small typo on new branch button spec Abillity to promote project labels to group labels Update and pin the `jwt` gem to ~> 1.5.6 refactor merge request build service Update index.md Clarify that Auto Deploy requires a public project. cop for gem fetched from a git source Add CHANGELOG entry Remove new branch button for confidential issues Remove flash warning from login page add complete changelog Add project ID index to `project_authorizations` table to optimize queries Fix disable storing of sensitive information when importing a new repo Fix notification when global=disabled, group=watch Ensure rake is called within the correct bundle context Fix 8.16.0 release date. Improve search within group logic Add changelog item about new attributes in group api Update group api doc with full_name and full_path attributes Add tests for nested groups in search service and search helper ...
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/issuables_helper.rb4
-rw-r--r--app/helpers/search_helper.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index e5bb8b93e76..03354c235eb 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -162,6 +162,10 @@ module IssuablesHelper
]
end
+ def issuable_reference(issuable)
+ @show_full_reference ? issuable.to_reference(full: true) : issuable.to_reference(@group || @project)
+ end
+
def issuable_filter_present?
issuable_filter_params.any? { |k| params.key?(k) }
end
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 6654f6997ce..37b69423c97 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -89,7 +89,7 @@ module SearchHelper
{
category: "Groups",
id: group.id,
- label: "#{search_result_sanitize(group.name)}",
+ label: "#{search_result_sanitize(group.full_name)}",
url: group_path(group)
}
end