diff --git a/app/views/deploy_keys/index.html.haml b/app/views/deploy_keys/index.html.haml index db167f4e2f29b115c943ca139b17ca70065d9df8..80d30e1c2dc54637c57e1604f400b14d2d5a3f80 100644 --- a/app/views/deploy_keys/index.html.haml +++ b/app/views/deploy_keys/index.html.haml @@ -1,4 +1,4 @@ -= render "repositories/head" += render "projects/settings_nav" %p.slead Deploy keys allow read-only access to repository. It matches perfectly for CI, staging or production servers. diff --git a/app/views/deploy_keys/new.html.haml b/app/views/deploy_keys/new.html.haml index e973cb7d305778f1f32bb895d075297c25a45c43..0bbea1ebed50389222fb72b9ca66689d35d84ac1 100644 --- a/app/views/deploy_keys/new.html.haml +++ b/app/views/deploy_keys/new.html.haml @@ -1,4 +1,4 @@ -= render "repositories/head" += render "projects/settings_nav" %h3.page_title New Deploy key %hr diff --git a/app/views/deploy_keys/show.html.haml b/app/views/deploy_keys/show.html.haml index 227afecb0619a60156a17359ea52df3caf5c680c..0a9f376d046c2add84ed01b3e46a44d7531604da 100644 --- a/app/views/deploy_keys/show.html.haml +++ b/app/views/deploy_keys/show.html.haml @@ -1,4 +1,5 @@ -= render "repositories/head" += render "projects/settings_nav" + %h3.page_title Deploy key: = @key.title diff --git a/app/views/hooks/index.html.haml b/app/views/hooks/index.html.haml index 808a348133ccfaf7edd24e346472307d0a705ade..3155dd32177d8dcc12e235e966a1420e73985658 100644 --- a/app/views/hooks/index.html.haml +++ b/app/views/hooks/index.html.haml @@ -1,4 +1,4 @@ -= render "projects/project_head" += render "projects/settings_nav" - if can? current_user, :admin_project, @project .alert.alert-info diff --git a/app/views/projects/_project_head.html.haml b/app/views/projects/_settings_nav.html.haml similarity index 100% rename from app/views/projects/_project_head.html.haml rename to app/views/projects/_settings_nav.html.haml diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index fdd537da3aab494fa815754f421e1eee896889c6..394522bfd88e9a91a99144da555b9acf0f1f259b 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -1,4 +1,5 @@ -= render "project_head" += render "projects/settings_nav" + .project_edit_holder %h3.page_title Edit Project %hr diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index 07132e678722b65c4efeb95ed82ad4409c75c5c9..b1795b301b0b652d2c9f2e16684752b178054392 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -1,4 +1,3 @@ -= render "project_head" = render 'clone_panel' %div.git-empty diff --git a/app/views/projects/teams/available.html.haml b/app/views/projects/teams/available.html.haml index da7823638b9741a7a84d199609437b0f2c6f0adc..29fe8ed25cd047675c8586f369634c6972f39783 100644 --- a/app/views/projects/teams/available.html.haml +++ b/app/views/projects/teams/available.html.haml @@ -1,4 +1,4 @@ -= render "projects/project_head" += render "projects/settings_nav" %h3.page_title = "Assign project to team of users" diff --git a/app/views/repositories/_head.html.haml b/app/views/repositories/_head.html.haml deleted file mode 100644 index bc96f306eee12845cc25902f58b494113842d150..0000000000000000000000000000000000000000 --- a/app/views/repositories/_head.html.haml +++ /dev/null @@ -1 +0,0 @@ -= render "projects/project_head" diff --git a/app/views/services/edit.html.haml b/app/views/services/edit.html.haml index d893847f1ae675e4ef5f8f34eb04396c65c3da05..0c63a7ed58ca2c6aa7f0c0cb61c9a9b69c707d32 100644 --- a/app/views/services/edit.html.haml +++ b/app/views/services/edit.html.haml @@ -1,2 +1,3 @@ -= render "projects/project_head" += render "projects/settings_nav" + = render 'gitlab_ci' diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml index 27dbf5025691bfb35ee8f631953048244504b59a..eb2f8d0ca1caa397a1a5898e3a91de840f8439ce 100644 --- a/app/views/services/index.html.haml +++ b/app/views/services/index.html.haml @@ -1,4 +1,5 @@ -= render "projects/project_head" += render "projects/settings_nav" + %h3.page_title Services %br diff --git a/app/views/team_members/import.html.haml b/app/views/team_members/import.html.haml index d6c81befd08865726d99e1e997bf21e0c84e6fa1..0f7175b901820268206938bad457ba0e57eab606 100644 --- a/app/views/team_members/import.html.haml +++ b/app/views/team_members/import.html.haml @@ -1,4 +1,4 @@ -= render "projects/project_head" += render "projects/settings_nav" %h3.page_title = "Import team from another project" diff --git a/app/views/team_members/index.html.haml b/app/views/team_members/index.html.haml index 6958ec4cfcc9a04485210523466499f702804ea0..50d44bcd8d8af463c8e104add4fc7d5b053c4bfe 100644 --- a/app/views/team_members/index.html.haml +++ b/app/views/team_members/index.html.haml @@ -1,4 +1,4 @@ -= render "projects/project_head" += render "projects/settings_nav" %h3.page_title Team Members (#{@project.users.count}) diff --git a/app/views/team_members/new.html.haml b/app/views/team_members/new.html.haml index 40eb4cebf08d0d87ecd03a8954fefbba2fa8c846..7e20f50d9640a96cb8f45dfcc4586571e6c21afa 100644 --- a/app/views/team_members/new.html.haml +++ b/app/views/team_members/new.html.haml @@ -1,2 +1,2 @@ -= render "projects/project_head" += render "projects/settings_nav" = render "team_members/form"