Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMek Stittri <mstittri@gitlab.com>2018-06-20 18:05:56 +0300
committerMek Stittri <mstittri@gitlab.com>2018-06-20 18:05:56 +0300
commit3e28cca5744410a82131bf02e17d785c7223d44b (patch)
tree2a5713659df1ed0c6865714032af9ac2c8f73b2a /app/views/projects/commits/_commit.html.haml
parentacdc0d73274b80fb104eea73e86eb4b9f92c848d (diff)
parentabc6be62a06349f395da0b33e814512ef15c06fb (diff)
Resolve conflicts with latest workflow label changes
Diffstat (limited to 'app/views/projects/commits/_commit.html.haml')
-rw-r--r--app/views/projects/commits/_commit.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index 12b27eb9b66..90e55fd0fb0 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -34,7 +34,8 @@
.d-block.d-sm-none
= render_commit_status(commit, ref: ref)
- if commit.description?
- %button.text-expander.d-none.d-sm-inline-block.js-toggle-button{ type: "button" } ...
+ %button.text-expander.js-toggle-button
+ = sprite_icon('ellipsis_h', size: 12)
.commiter
- commit_author_link = commit_author_link(commit, avatar: false, size: 24)