Merge pull request #6412 from skv-headless/commit_description

commit description in commit list

Merge pull request #6412 from skv-headless/commit_description
commit description in commit list
Dmitriy Zaporozhets
2 parents 5bdcdcd8 2c28dbd2
Showing 3 changed files with 49 additions and 8 deletions Show diff stats
app/assets/stylesheets/sections/commits.scss
app/models/commit.rb
app/views/projects/commits/_commit.html.haml
@@ -168,6 +168,32 @@ li.commit {
         text-decoration: underline;
       }
     }
+
+    .text-expander {
+      background: #ddd;
+      color: #555;
+      padding: 0 5px;
+      line-height: 6px;
+      height: 12px;
+      font-size: 12px;
+      font-weight: bold;
+      vertical-align: middle;
+      display: inline-block;
+      border-radius: 1px;
+      text-decoration: none;
+      cursor: pointer;
+      &:hover {
+        background-color: #ccc;
+      }
+    }
+  }
+
+  .commit-row-description {
+    font-size: 14px;
+    border-left: 1px solid #e5e5e5;
+    padding: 0 15px 0 7px;
+    margin: 5px 0 10px 5px;
+    display: none;
   }
   .commit-row-info {
@@ -192,4 +218,10 @@ li.commit {
       @extend .cgray;
     }
   }
+
+  &.open {
+    .commit-row-description {
+      display: block;
+    }
+  }
 }
@@ -99,14 +99,16 @@ class Commit
   #
   # cut off, ellipses (`&hellp;`) are prepended to the commit message.
   def description
-    description = safe_message
+    title_end = safe_message.index(/\n/)
+    @description ||= if (!title_end && safe_message.length > 100) || (title_end && title_end > 100)
+                    "&hellip;".html_safe << safe_message[80..-1]
+                  else
+                    safe_message.split(/\n/, 2)[1].try(:chomp)
+                  end
+  end
-    title_end = description.index(/\n/)
-    if (!title_end && description.length > 100) || (title_end && title_end > 100)
-      "&hellip;".html_safe << description[80..-1]
-    else
-      description.split(/\n/, 2)[1].try(:chomp)
-    end
+  def description?
+    description.present?
   end
   # Regular expression that identifies commit message clauses that trigger issue closing.
 %li.commit
-  .commit-row-title
+  .commit-row-title{"data-toggle" => "dropdown"}
     = link_to commit.short_id(8), project_commit_path(project, commit), class: "commit_short_id"
     &nbsp;
     %span.str-truncated
       = link_to_gfm commit.title, project_commit_path(project, commit.id), class: "commit-row-message"
+      - if commit.description?
+        %span.label-default.text-expander.js-details-target ...
+
     = link_to "Browse Code »", project_tree_path(project, commit), class: "pull-right"
     .notes_count
       - notes = project.notes.for_commit_id(commit.id)
@@ -12,6 +15,10 @@
           %i.icon-comment
           = notes.count
+  - if commit.description?
+    .commit-row-description
+      = simple_format(commit.description)
+
   .commit-row-info
     = commit_author_link(commit, avatar: true, size: 16)
     .committed_ago
	@@ -168,6 +168,32 @@ li.commit {		@@ -168,6 +168,32 @@ li.commit {
168	text-decoration: underline;	168	text-decoration: underline;
169	}	169	}
170	}	170	}
		171	+
		172	+ .text-expander {
		173	+ background: #ddd;
		174	+ color: #555;
		175	+ padding: 0 5px;
		176	+ line-height: 6px;
		177	+ height: 12px;
		178	+ font-size: 12px;
		179	+ font-weight: bold;
		180	+ vertical-align: middle;
		181	+ display: inline-block;
		182	+ border-radius: 1px;
		183	+ text-decoration: none;
		184	+ cursor: pointer;
		185	+ &:hover {
		186	+ background-color: #ccc;
		187	+ }
		188	+ }
		189	+ }
		190	+
		191	+ .commit-row-description {
		192	+ font-size: 14px;
		193	+ border-left: 1px solid #e5e5e5;
		194	+ padding: 0 15px 0 7px;
		195	+ margin: 5px 0 10px 5px;
		196	+ display: none;
171	}	197	}
172		198
173	.commit-row-info {	199	.commit-row-info {
	@@ -192,4 +218,10 @@ li.commit {		@@ -192,4 +218,10 @@ li.commit {
192	@extend .cgray;	218	@extend .cgray;
193	}	219	}
194	}	220	}
		221	+
		222	+ &.open {
		223	+ .commit-row-description {
		224	+ display: block;
		225	+ }
		226	+ }
195	}	227	}