diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2017-04-20 10:20:56 -0400 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2017-04-20 10:20:56 -0400 |
| commit | cfd1c1a4052c19f1796e5d79bd3112c64d5bf3c9 (patch) | |
| tree | d485e39fa84a14243d85980a470371440fb029f0 | |
| parent | 8dba91a429f3bdca7ecaba3686291e1cee080526 (diff) | |
| download | gitlab-ce-clusterized-render.tar.gz | |
Remove crufty stuff.clusterized-render
| -rw-r--r-- | app/assets/javascripts/diff.js | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/issuable_context.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/diffs/_line.html.haml | 3 |
4 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/diff.js b/app/assets/javascripts/diff.js index 81923275407..5aa3eb46a69 100644 --- a/app/assets/javascripts/diff.js +++ b/app/assets/javascripts/diff.js @@ -1,4 +1,5 @@ /* eslint-disable class-methods-use-this */ + require('./lib/utils/url_utility'); const UNFOLD_COUNT = 20; diff --git a/app/assets/javascripts/issuable_context.js b/app/assets/javascripts/issuable_context.js index 4bee80bc793..834b98e8601 100644 --- a/app/assets/javascripts/issuable_context.js +++ b/app/assets/javascripts/issuable_context.js @@ -47,7 +47,7 @@ import Cookies from 'js-cookie'; Cookies.set('collapsed_gutter', true); } }); - // $(".right-sidebar").niceScroll(); + $(".right-sidebar").niceScroll(); } IssuableContext.prototype.initParticipants = function() { diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index dac9f056498..2ea2ff8362b 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -530,6 +530,7 @@ ul.notes { */ .add-diff-note { + display: none; margin-top: -2px; border-radius: 50%; background: $white-light; @@ -538,6 +539,7 @@ ul.notes { color: $blue-500; margin-left: -55px; position: absolute; + z-index: 10; width: 23px; height: 23px; border: 1px solid $blue-500; diff --git a/app/views/projects/diffs/_line.html.haml b/app/views/projects/diffs/_line.html.haml index fb465f71279..3e426ee9e7d 100644 --- a/app/views/projects/diffs/_line.html.haml +++ b/app/views/projects/diffs/_line.html.haml @@ -34,8 +34,7 @@ %pre= line.text - else = diff_line_content(line.text) - %button{ name: "button", type: "submit", class: "hidden add-diff-note js-add-diff-note-button", title:"Add a comment to this line"} - %i.fa.fa-comment-o + - if line_discussions - discussion_expanded = local_assigns.fetch(:discussion_expanded, line_discussions.any?(&:expanded?)) = render "discussions/diff_discussion", discussions: line_discussions, expanded: discussion_expanded |