diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-02-21 15:37:00 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-03-06 09:47:44 -0600 |
| commit | a29517dd0c6515121a2f42e08ad011415a3d8618 (patch) | |
| tree | 93977c5a003a378749a3de252336500a732771d6 /app/views/projects | |
| parent | 336b818bcbcb070968f825f6a426e046a457d556 (diff) | |
| download | gitlab-ce-a29517dd0c6515121a2f42e08ad011415a3d8618.tar.gz | |
Added tests for the repository_controller and repository_helper
Added specs for the deploy_keys_presenter and added a new method in the presenter
called #key_available?
Fixed some minor UX inconsistencies and added a concern to handle
redirection
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/deploy_keys/_deploy_key.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/deploy_keys/_index.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/deploy_keys/_deploy_key.html.haml b/app/views/projects/deploy_keys/_deploy_key.html.haml index 337f8c38a93..ec8fc4c9ee8 100644 --- a/app/views/projects/deploy_keys/_deploy_key.html.haml +++ b/app/views/projects/deploy_keys/_deploy_key.html.haml @@ -18,7 +18,7 @@ %span.key-created-at created #{time_ago_with_tooltip(deploy_key.created_at)} .visible-xs-block.visible-sm-block - - if @deploy_keys.available_keys.include?(deploy_key) + - if @deploy_keys.key_available?(deploy_key) = link_to enable_namespace_project_deploy_key_path(@project.namespace, @project, deploy_key), class: "btn btn-sm prepend-left-10", method: :put do Enable - else diff --git a/app/views/projects/deploy_keys/_index.html.haml b/app/views/projects/deploy_keys/_index.html.haml index 91acad83bf3..9f351d3b90e 100644 --- a/app/views/projects/deploy_keys/_index.html.haml +++ b/app/views/projects/deploy_keys/_index.html.haml @@ -19,7 +19,7 @@ = 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. + No deploy keys found. Create one with the form above. %h5.prepend-top-default Deploy keys from projects you have access to (#{@deploy_keys.available_project_keys_size}) - if @deploy_keys.any_available_project_keys_enabled? |