diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-07-15 13:37:06 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-07-15 13:37:06 +0000 |
| commit | 47ca5c369a039e7f5e195fe884a54f86cdde195a (patch) | |
| tree | 103588a1b380ce3881236ccfc93a1103c3f558ff | |
| parent | de204b9565cbe5f614ada9ea4f89c6b3495b7d0a (diff) | |
| parent | f435eb6f35ab755dae1fd45d9aa577f6896eae7b (diff) | |
| download | gitlab-ce-47ca5c369a039e7f5e195fe884a54f86cdde195a.tar.gz | |
Merge branch 'fix-navbar-icon' into 'master'
navbar_icon was renamed to custom_icon
In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4909 it's still using `navbar_icon` but now it's renamed to `custom_icon` in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5156
/cc @iamphill @smcgivern @annabeldunstone
See merge request !5265
| -rw-r--r-- | app/views/dashboard/projects/_zero_authorized_projects.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/dashboard/projects/_zero_authorized_projects.html.haml b/app/views/dashboard/projects/_zero_authorized_projects.html.haml index 40c70fa3025..fdea834ff45 100644 --- a/app/views/dashboard/projects/_zero_authorized_projects.html.haml +++ b/app/views/dashboard/projects/_zero_authorized_projects.html.haml @@ -6,7 +6,7 @@ Code, test, and deploy together .blank-state .blank-state-icon - = navbar_icon("project", size: 50) + = custom_icon("project", size: 50) %h3.blank-state-title You don't have access to any projects right now %p.blank-state-text @@ -24,7 +24,7 @@ - if current_user.can_create_group? .blank-state .blank-state-icon - = navbar_icon("group", size: 50) + = custom_icon("group", size: 50) %h3.blank-state-title You can create a group for several dependent projects. %p.blank-state-text |