Dmitriy Zaporozhets d4cd6dcaa0 Merge branch 'settings-dropdown-permissions' into 'master' ... Fix displaying of project settings links the user cannot access. ## What does this MR do? It fixes the Project Settings dropdown displaying project settings links that the user cannot actually access. ## Are there points in the code the reviewer needs to double check? I've tested combinations I can think of, feel free to mess around with and see if it breaks? ## Why was this MR needed? Users were seeing links in the Project Settings dropdown that they shouldn't have seen, if they clicked them they would be shown permission errors. ## What are the relevant issue numbers? #18294 ## Screenshots (if relevant) Users without any permissions:  Guest members of the project:  Full permissions:  cc: @dzaporozhets @annabeldunstone @jschatz1 See merge request !4599		2016-06-14 14:11:13 +00:00
..
ci	Revert side nav to full width; remove border under nav; remove tooltips on nav links; stop page content shifting with side nav; put project nav in container	2016-06-10 12:01:51 -05:00
header	Add back sidebar counters and username	2016-06-10 12:39:58 -05:00
nav	Merge branch 'settings-dropdown-permissions' into 'master'	2016-06-14 14:11:13 +00:00
_bootlint.haml	Bootlint integration	2015-04-01 21:33:22 +02:00
_broadcast.html.haml	Update broadcast_message helper	2016-01-13 11:34:58 -05:00
_collapse_button.html.haml	Revert side nav to full width; remove border under nav; remove tooltips on nav links; stop page content shifting with side nav; put project nav in container	2016-06-10 12:01:51 -05:00
_flash.html.haml	hide no-ssh message if notice or alert present	2013-08-10 21:20:03 +03:00
_google_analytics.html.haml
_head.html.haml	Render gon data in the page body, not head	2016-06-06 12:50:31 +05:30
_init_auto_complete.html.haml	Only load autocomplete data when actually needed	2016-01-11 11:13:11 +01:00
_page.html.haml	Center layout navigation and remove icons	2016-06-11 11:30:53 +03:00
_page_title.html.haml	Replace page_title with page-title. Correct margin for some blocks/layouts	2013-07-13 08:45:48 +03:00
_piwik.html.haml	Update piwik template	2015-11-08 18:03:30 +02:00
_search.html.haml	Clicking search pill focuses field	2016-05-24 16:59:18 +01:00
_user_styles.html.haml	Use display: inline where appropriate	2015-08-06 14:55:03 +02:00
admin.html.haml	Page titles are title case.	2015-12-02 14:06:25 +01:00
application.html.haml	Render gon data in the page body, not head	2016-06-06 12:50:31 +05:30
dashboard.html.haml	Move project header title definition to view in question.	2015-09-17 12:16:24 +02:00
devise.html.haml	Render gon data in the page body, not head	2016-06-06 12:50:31 +05:30
devise_empty.html.haml	Render gon data in the page body, not head	2016-06-06 12:50:31 +05:30
devise_mailer.html.haml	New confirmation email 🔥	2016-05-25 16:56:06 -04:00
errors.html.haml	Render gon data in the page body, not head	2016-06-06 12:50:31 +05:30
explore.html.haml	Clean up overlap between dashboard and explore.	2015-09-08 14:49:20 +01:00
group.html.haml	Dont specify sidebar for group and group settings layouts	2016-05-03 12:31:50 +02:00
group_settings.html.haml	Dont specify sidebar for group and group settings layouts	2016-05-03 12:31:50 +02:00
help.html.haml	Add helpers for header title and sidebar, and move setting those from controllers to layouts.	2015-05-01 10:39:16 +02:00
notify.html.haml	Syntax-highlight diffs in push emails	2016-05-17 13:23:17 +01:00
profile.html.haml	Implement top navigation concept for profile area	2016-04-19 20:05:30 +02:00
project.html.haml	Hook up the updated WikiLinkFilter to the wiki controllers.	2016-06-09 10:15:01 +05:30
project_settings.html.haml	Implement new horizontal navigation to project pages	2016-05-16 12:21:12 -05:00
search.html.haml	Add helpers for header title and sidebar, and move setting those from controllers to layouts.	2015-05-01 10:39:16 +02:00
snippets.html.haml	Clean up overlap between dashboard and explore.	2015-09-08 14:49:20 +01:00