Commit 8d171f0a authored by Filipa Lacerda's avatar Filipa Lacerda

Fix commit column with correct data

parent 4388d903
.branch-commit{"v-if" => "!isFolder && model.last_deployment"} .branch-commit{"v-if" => "!isFolder && model.last_deployment"}
.icon-container{ "v-if" => "model.last_deployment.ref && model.last_deployment.tag" }
=icon("tag")
%div{ "v-if" => "model.last_deployment.ref" } .icon-container{ "v-if" => "model.last_deployment.ref && !model.last_deployment.tag" }
=icon("code-fork")
.icon-container{ "v-if" => "model.last_deployment.tag" } %a.monospace.branch-name{"v-if" => "model.last_deployment.ref", ":href" => "model.last_deployment.ref.ref_url"}
=icon("tag") {{model.last_deployment.ref.name}}
.icon-container{ "v-if" => "!model.last_deployment.tag" }
=icon("code-fork")
%a.monospace.branch-name{":href" => "'/' + model.project.namespace.name + '/' + model.project.name + '/commits/' +model.last_deployment.ref"}
{{model.last_deployment.ref}}
.icon-container.commit-icon .icon-container.commit-icon
= custom_icon("icon_commit") = custom_icon("icon_commit")
%a.commit-id.monospace{":href" => "'/' + model.project.namespace.name + '/' + model.project.name + '/commit/' +model.last_deployment.sha"} %a.commit-id.monospace{":href" => "model.last_deployment.commit.commit_url"}
{{model.last_deployment.short_sha}} {{model.last_deployment.commit.short_id}}
%p.commit-title %p.commit-title
%span{ "v-if" => "model.last_deployment.commit_title"} %span{ "v-if" => "model.last_deployment.commit && model.last_deployment.commit.title"}
%a{"v-if" => "model.last_deployment.commit.author", ":href" => "model.last_deployment.commit.author.web_url"}
-# need commit author username and avatar_url %img.avatar.has-tooltip.s20{":title" => "model.last_deployment.commit.author.username",
commit author goes here ":src" => "model.last_deployment.commit.author.avatar_url"}
%a.commit-row-message{":href" => "'/' + model.project.namespace.name + '/' + model.project.name + '/commit/' +model.last_deployment.sha"} %a.commit-row-message{":href" => "model.last_deployment.commit.commit_url"}
{{model.last_deployment.commit_title}} {{model.last_deployment.commit.title}}
%span{ "v-if" => "!model.last_deployment.commit_title"} %span{ "v-if" => "!model.last_deployment.commit.title"}
Cant find HEAD commit for this branch Cant find HEAD commit for this branch
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
%span.badge.js-stopped-environments-count %span.badge.js-stopped-environments-count
{{state.stoppedCounter}} {{state.stoppedCounter}}
- if can?(current_user, :create_environment, @project) && !@all_environments.blank? - if can?(current_user, :create_environment, @project)
.nav-controls .nav-controls{ "v-if" => "!loading" }
= link_to new_namespace_project_environment_path(@project.namespace, @project), class: "btn btn-create" do = link_to new_namespace_project_environment_path(@project.namespace, @project), class: "btn btn-create" do
New environment New environment
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment