diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 18:09:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 18:09:29 +0300 |
| commit | 209bd8cf1f542f6ba2a069b368a9187faa871e96 (patch) | |
| tree | 6b77dc8183135b8316cc70c8dbc9c4e7c18cf05a /app/views | |
| parent | a9ced7da447785c57477b3d8dbccc73a78cface1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/static_site_editor/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 5636df7d5e0..f6255dac7cf 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -65,7 +65,7 @@ .dropdown-menu.dropdown-menu-right = render 'layouts/header/help_dropdown' - if header_link?(:user_dropdown) - %li.nav-item.header-user.dropdown{ data: { track_label: "profile_dropdown", track_event: "click_dropdown", track_value: "", qa_selector: 'user_menu' }, class: ('mr-0' if has_impersonation_link) } + %li.nav-item.header-user.js-nav-user-dropdown.dropdown{ data: { track_label: "profile_dropdown", track_event: "click_dropdown", track_value: "", qa_selector: 'user_menu' }, class: ('mr-0' if has_impersonation_link) } = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do = image_tag avatar_icon_for_user(current_user, 23), width: 23, height: 23, class: "header-user-avatar qa-user-avatar" = render_if_exists 'layouts/header/user_notification_dot', project: project, namespace: group diff --git a/app/views/projects/static_site_editor/show.html.haml b/app/views/projects/static_site_editor/show.html.haml index 574cdd0bf88..9ccc54e6d51 100644 --- a/app/views/projects/static_site_editor/show.html.haml +++ b/app/views/projects/static_site_editor/show.html.haml @@ -1 +1 @@ -#static-site-editor{ data: {} } +#static-site-editor{ data: { project_id: '8', path: 'README.md' } } |