diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/themes/ui_modern.scss | 14 | ||||
| -rw-r--r-- | app/controllers/users_controller.rb | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/app/assets/stylesheets/themes/ui_modern.scss b/app/assets/stylesheets/themes/ui_modern.scss index 67616a4a10d..308a03477db 100644 --- a/app/assets/stylesheets/themes/ui_modern.scss +++ b/app/assets/stylesheets/themes/ui_modern.scss @@ -16,28 +16,28 @@ @extend .header-dark; &.navbar-gitlab { .navbar-inner { - background: #00AC7E; - border-bottom: 1px solid #00AC7E; + background: #019875; + border-bottom: 1px solid #019875; .app_logo, .navbar-toggle { &:hover { - background-color: #009C6E; + background-color: #018865; } } .separator { - background: #009C6F; - border-left: 1px solid #10BC8E; + background: #018865; + border-left: 1px solid #11A885; } .nav > li > a { color: #ADC; } .search-input { - border-color: #7fd5be; + border-color: #8ba; } } } } .nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus { - background: #00AC7E; + background: #019875; } } diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d42c2db9e5f..c17c6f9694a 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -11,7 +11,8 @@ class UsersController < ApplicationController end @groups = @user.groups.accessible_to(current_user) - @events = @user.recent_events.where(project_id: @projects.pluck(:id)).limit(20) + accessible_projects = @user.authorized_projects.accessible_to(current_user) + @events = @user.recent_events.where(project_id: accessible_projects.pluck(:id)).limit(20) @title = @user.name end |