diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2016-11-07 17:01:40 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2016-11-16 11:58:07 +0000 |
| commit | f5d9b994e4a2362140c73f6be5de280f6ec64eaf (patch) | |
| tree | 9f43d4940bd4dece55c85d74a295b8cf0671254a | |
| parent | 1b00f3a5bb556118298a3396437db74dec7b5933 (diff) | |
| download | gitlab-ce-f5d9b994e4a2362140c73f6be5de280f6ec64eaf.tar.gz | |
Use urls sent in JSON response
| -rw-r--r-- | app/views/projects/environments/components/_environment.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/environments/components/_environment.html.haml b/app/views/projects/environments/components/_environment.html.haml index 42c6ae562e0..a90517f76a0 100644 --- a/app/views/projects/environments/components/_environment.html.haml +++ b/app/views/projects/environments/components/_environment.html.haml @@ -2,7 +2,7 @@ %tr %td{"v-bind:class" => "{ 'children-row': isChildren}" } %a.environment-name{ "v-if" => "!isFolder", - ":href" => "'#{namespace_project_environments_path(@project.namespace, @project)}/' + model.id" } + ":href" => "model.environment_url" } {{model.name}} %span.folder-name{ "v-if" => "isFolder", @@ -25,7 +25,7 @@ %span{ "v-if" => "model.last_deployment.user" } by - %a{":href" => "'/' + model.last_deployment.user.username" } + %a{":href" => "model.last_deployment.user.web_url" } %img.avatar.has_tooltip.s20{ ":src" => "model.last_deployment.user.avatar_url", ":alt" => "model.last_deployment.user.username + `'s avatar`", ":title" => "model.last_deployment.user.username", @@ -34,7 +34,7 @@ %td %a.build-link{ "v-if" => "!isFolder && model.last_deployment && model.last_deployment.deployable", - ":href" => "'#{namespace_project_builds_path(@project.namespace, @project)}/' + model.last_deployment.deployable.id" } + ":href" => "model.last_deployment.deployable.build_url" } {{model.last_deployment.deployable.name}} = precede "#" do {{model.last_deployment.deployable.id}} @@ -47,7 +47,7 @@ %td %span{ "v-if" => "!isFolder && model.last_deployment" } - {{model.last_deployment.created_at}} + {{model.created_at}} %td.hidden-xs .pull-right{ "v-if" => "!isFolder" } |