diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-12-22 19:30:32 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-12-22 19:30:32 +0000 |
| commit | 3b61dc47ec377b857b66f9b2a81a183276163f4e (patch) | |
| tree | b125241794a7d7143628dd685b1e8682c8586cc1 /app/views | |
| parent | 1cf45407d3be9e9767d27e55b6f3e2e0d8dea36f (diff) | |
| parent | 66a8281fddf8e4f9d39265a6bfb38e8a6a8309c2 (diff) | |
| download | gitlab-ce-3b61dc47ec377b857b66f9b2a81a183276163f4e.tar.gz | |
Merge branch 'fix_leave_project_display' into 'master'
Fix and test leave project display
The 'Leave this project' display on project page was broken. It was calling the method incorrectly, which returned `nil` and displayed nothing.
This fixes the display and also adds 2 different tests for it.
cc/ @jvanbaarsen @stanhu Please review and merge if you think it looks good. Thank you!
See merge request !2166
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 9c7a5584da9..7466a098e24 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -71,7 +71,7 @@ = render default_project_view - if current_user - - access = user_max_access_in_project(current_user, @project) + - access = user_max_access_in_project(current_user.id, @project) - if access .prepend-top-20.project-footer .gray-content-block.footer-block.center |