diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-14 21:26:35 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-14 21:26:35 +0200 |
| commit | cbd78922ee43c0124458e2867071f752cae712f4 (patch) | |
| tree | 5367dd4e0370f11bc5733de364016f2572a3323f /app/views/repositories | |
| parent | 09b877ef29a0c641457eb986c5b228d003c51c16 (diff) | |
| parent | dda6b0ab63eb8080e34b4273cfb6aadb7a29c028 (diff) | |
| download | gitlab-ce-cbd78922ee43c0124458e2867071f752cae712f4.tar.gz | |
Merge branch 'deploy_keys'
Conflicts:
app/views/layouts/project.html.haml
db/schema.rb
Diffstat (limited to 'app/views/repositories')
| -rw-r--r-- | app/views/repositories/_head.html.haml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/views/repositories/_head.html.haml b/app/views/repositories/_head.html.haml index 53af050df44..82a22807634 100644 --- a/app/views/repositories/_head.html.haml +++ b/app/views/repositories/_head.html.haml @@ -11,13 +11,18 @@ = link_to project_hooks_path, :class => "tab #{'active' if controller.controller_name == "hooks" }" do %span Hooks - -#= link_to "#", :class => "tab" do - %span - Deploy Keys + - if can? current_user, :admin_project, @project + = link_to project_deploy_keys_path(@project), :class => "tab #{'active' if controller.controller_name == "deploy_keys"}" do + %span + Deploy Keys - if current_page?(project_hooks_path(@project)) - if can? current_user, :admin_project, @project = link_to new_project_hook_path(@project), :class => "add_new", :title => "New Web Hook" do = image_tag "add_new.png", :width => 14 + - if current_page?(project_deploy_keys_path(@project)) + - if can? current_user, :admin_project, @project + = link_to new_project_deploy_key_path(@project), :class => "add_new", :title => "New Deploy Key", :remote => true do + = image_tag "add_new.png", :width => 14 |