diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-01-30 13:21:02 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-03-06 09:47:44 -0600 |
| commit | 2ee86441158076344a07f2715a148a5bdbe161b0 (patch) | |
| tree | 2bf1f0dc0c49b3e888e7cd8ad6875e14899f0fef /app/views | |
| parent | 0b74ae849d3f87564e789673ecf67aa54ec7cd8a (diff) | |
| download | gitlab-ce-2ee86441158076344a07f2715a148a5bdbe161b0.tar.gz | |
Fixed tests, changed dispatcher routing to the 'repository:show'
Also modified the render calls to the deploy_keys and protected_branches
partials
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/deploy_keys/_index.html.haml | 9 | ||||
| -rw-r--r-- | app/views/projects/protected_branches/_protected_branch.html.haml | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/app/views/projects/deploy_keys/_index.html.haml b/app/views/projects/deploy_keys/_index.html.haml index 57de5be89cc..c41fb892862 100644 --- a/app/views/projects/deploy_keys/_index.html.haml +++ b/app/views/projects/deploy_keys/_index.html.haml @@ -15,7 +15,8 @@ Enabled deploy keys for this project (#{@enabled_keys.size}) - if @enabled_keys.any? %ul.well-list - = render @enabled_keys + - @enabled_keys.each do |enabled_key| + = render partial: 'projects/deploy_keys/deploy_key', locals: {deploy_key: enabled_key} - else .settings-message.text-center No deploy keys found. Create one with the form above or add existing one below. @@ -23,7 +24,8 @@ Deploy keys from projects you have access to (#{@available_project_keys.size}) - if @available_project_keys.any? %ul.well-list - = render @available_project_keys + - @available_project_keys.each do |available_key| + = render partial: 'projects/deploy_keys/deploy_key', locals: {deploy_key: available_key} - else .settings-message.text-center No deploy keys from your projects could be found. Create one with the form above or add existing one below. @@ -31,4 +33,5 @@ %h5.prepend-top-default Public deploy keys available to any project (#{@available_public_keys.size}) %ul.well-list - = render @available_public_keys + - @available_public_keys.each do |available_key| + = render partial: 'projects/deploy_keys/deploy_key', locals: {deploy_key: available_key} diff --git a/app/views/projects/protected_branches/_protected_branch.html.haml b/app/views/projects/protected_branches/_protected_branch.html.haml index 0193800dedf..b2a6b8469a3 100644 --- a/app/views/projects/protected_branches/_protected_branch.html.haml +++ b/app/views/projects/protected_branches/_protected_branch.html.haml @@ -14,7 +14,7 @@ - else (branch was removed from repository) - = render partial: 'update_protected_branch', locals: { protected_branch: protected_branch } + = render partial: 'projects/protected_branches/update_protected_branch', locals: { protected_branch: protected_branch } - if can_admin_project %td |