diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-18 09:58:12 +0200 | 
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-18 09:58:12 +0200 | 
| commit | e62c87c446ec130fdef4be3aa524accc6a30b005 (patch) | |
| tree | 13c1a7afdafae2aa780cd564429e007ccfaa23d5 | |
| parent | bf9372eaeb00d1ca5398d7d13f5afa65153e82da (diff) | |
| parent | 14fa0d5bd7c6bd4a7eb02de8c7e16f44583706d6 (diff) | |
| download | gitlab-ce-e62c87c446ec130fdef4be3aa524accc6a30b005.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | app/views/layouts/admin.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/navless.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/public.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/public_projects.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/public_users.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/search.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/user_team.html.haml | 1 | 
7 files changed, 7 insertions, 0 deletions
| diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index 439cb978a76..53e0dbaef9b 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -2,6 +2,7 @@  %html{ lang: "en"}    = render "layouts/head", title: "Admin area"    %body{class: "#{app_theme} admin", :'data-page' => body_data_page} +    = render "layouts/broadcast"      = render "layouts/head_panel", title: "Admin area"      = render "layouts/flash"      %nav.main-nav.navbar-collapse.collapse diff --git a/app/views/layouts/navless.html.haml b/app/views/layouts/navless.html.haml index 7325664bc19..c43d688a2cb 100644 --- a/app/views/layouts/navless.html.haml +++ b/app/views/layouts/navless.html.haml @@ -2,6 +2,7 @@  %html{ lang: "en"}    = render "layouts/head", title: @title    %body{class: "#{app_theme} application", :'data-page' => body_data_page} +    = render "layouts/broadcast"      = render "layouts/head_panel", title: @title      = render "layouts/flash" diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index fda81b3cc83..3c76bbb9575 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -2,6 +2,7 @@  %html{ lang: "en"}    = render "layouts/head", title: "Public Projects"    %body{class: "#{app_theme} application", :'data-page' => body_data_page} +    = render "layouts/broadcast"      - if current_user        = render "layouts/head_panel", title: "Public Projects"      - else diff --git a/app/views/layouts/public_projects.html.haml b/app/views/layouts/public_projects.html.haml index 7de2347803a..5fcf9f99e75 100644 --- a/app/views/layouts/public_projects.html.haml +++ b/app/views/layouts/public_projects.html.haml @@ -2,6 +2,7 @@  %html{ lang: "en"}    = render "layouts/head", title: @project.name_with_namespace    %body{class: "#{app_theme} application", :'data-page' => body_data_page} +    = render "layouts/broadcast"      = render "layouts/public_head_panel", title: @project.name_with_namespace      %nav.main-nav        .container= render 'layouts/nav/project' diff --git a/app/views/layouts/public_users.html.haml b/app/views/layouts/public_users.html.haml index 80709d650da..4aa258fea0d 100644 --- a/app/views/layouts/public_users.html.haml +++ b/app/views/layouts/public_users.html.haml @@ -2,6 +2,7 @@  %html{ lang: "en"}    = render "layouts/head", title: @title    %body{class: "#{app_theme} application", :'data-page' => body_data_page} +    = render "layouts/broadcast"      = render "layouts/public_head_panel", title: @title      .container.navless-container        .content= yield diff --git a/app/views/layouts/search.html.haml b/app/views/layouts/search.html.haml index 177b3a4f8f4..97ed8ba12df 100644 --- a/app/views/layouts/search.html.haml +++ b/app/views/layouts/search.html.haml @@ -2,6 +2,7 @@  %html{ lang: "en"}    = render "layouts/head", title: "Search"    %body{class: "#{app_theme} application", :'data-page' => body_data_page} +    = render "layouts/broadcast"      = render "layouts/head_panel", title: "Search"      = render "layouts/flash" diff --git a/app/views/layouts/user_team.html.haml b/app/views/layouts/user_team.html.haml index 191ad406c3c..ce13853ed7f 100644 --- a/app/views/layouts/user_team.html.haml +++ b/app/views/layouts/user_team.html.haml @@ -2,6 +2,7 @@  %html{ lang: "en"}    = render "layouts/head", title: "#{@team.name}"    %body{class: "#{app_theme} application", :'data-page' => body_data_page} +    = render "layouts/broadcast"      = render "layouts/head_panel", title: "team: #{@team.name}"      = render "layouts/flash"      %nav.main-nav.navbar-collapse.collapse | 
