diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-06-02 11:05:38 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-06-02 11:05:38 +0300 |
| commit | ea531e1effa51bcec84e50a69901e6eec7c789c1 (patch) | |
| tree | d3c1281deea1c9b2e8596cfa79a2e9d5cd4f7a10 /app/views/layouts/application.html.haml | |
| parent | 4d141cb30dfcad94db89bdc08f4ea907dc2f8bdf (diff) | |
| parent | fc56d2fbaa2a317813c9dd7ba36e584162175fe6 (diff) | |
| download | gitlab-ce-ea531e1effa51bcec84e50a69901e6eec7c789c1.tar.gz | |
Merge remote-tracking branch 'origin/master' into 25426-group-dashboard-ui
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/layouts/application.html.haml')
| -rw-r--r-- | app/views/layouts/application.html.haml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 36543edc040..03688e9ff21 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,11 +1,9 @@ !!! 5 -%html{ lang: "en", class: "#{page_class}" } +%html{ lang: I18n.locale, class: "#{page_class}" } = render "layouts/head" %body{ class: @body_class, data: { page: body_data_page, project: "#{@project.path if @project}", group: "#{@group.path if @group}" } } - = Gon::Base.render_data - + = render "layouts/init_auto_complete" if @gfm_form = render "layouts/header/default", title: header_title = render 'layouts/page', sidebar: sidebar, nav: nav = yield :scripts_body - = render "layouts/init_auto_complete" if @gfm_form |