Moved away from vuejs-rails
Fixed issue with resolve buttons always being visible - even when not logged in
This commit is contained in:
parent
b550e6ee67
commit
50e0728cc9
1
Gemfile
1
Gemfile
|
@ -349,4 +349,3 @@ gem 'health_check', '~> 2.1.0'
|
|||
# System information
|
||||
gem 'vmstat', '~> 2.1.1'
|
||||
gem 'sys-filesystem', '~> 1.1.6'
|
||||
gem 'vuejs-rails'
|
||||
|
|
|
@ -776,7 +776,6 @@ GEM
|
|||
descendants_tracker (~> 0.0, >= 0.0.3)
|
||||
equalizer (~> 0.0, >= 0.0.9)
|
||||
vmstat (2.1.1)
|
||||
vuejs-rails (1.0.24)
|
||||
warden (1.2.6)
|
||||
rack (>= 1.0)
|
||||
web-console (2.3.0)
|
||||
|
@ -985,8 +984,11 @@ DEPENDENCIES
|
|||
vmstat (~> 2.1.1)
|
||||
=======
|
||||
vmstat (~> 2.1.0)
|
||||
<<<<<<< HEAD
|
||||
vuejs-rails
|
||||
>>>>>>> Diff line comments resolve
|
||||
=======
|
||||
>>>>>>> Moved away from vuejs-rails
|
||||
web-console (~> 2.0)
|
||||
webmock (~> 1.21.0)
|
||||
wikicloth (= 0.8.1)
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
loading: false
|
||||
computed:
|
||||
buttonText: ->
|
||||
if this.comments[this.noteId] then "Mark as un-resolved" else "Mark as resolved"
|
||||
if this.isResolved then "Mark as un-resolved" else "Mark as resolved"
|
||||
isResolved: -> this.comments[this.noteId]
|
||||
methods:
|
||||
updateTooltip: ->
|
||||
|
|
|
@ -44,14 +44,15 @@
|
|||
= succeed '.' do
|
||||
= link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
|
||||
|
||||
#resolve-all-app{ "v-cloak" => true }
|
||||
%resolve-all{ "inline-template" => true }
|
||||
.line-resolve-all{ "v-show" => "commentsCount > 0" }
|
||||
%button.btn.btn-gray{ type: "button", "aria-label" => "Resolve all", "@click" => "updateAll", ":disabled" => "loading" }
|
||||
= icon("spinner spin", "v-show" => "loading")
|
||||
{{ buttonText }}
|
||||
%span.line-resolve-text
|
||||
{{ resolved }}/{{ commentsCount }} comments resolved
|
||||
- if current_user
|
||||
#resolve-all-app{ "v-cloak" => true }
|
||||
%resolve-all{ "inline-template" => true }
|
||||
.line-resolve-all{ "v-show" => "commentsCount > 0" }
|
||||
%button.btn.btn-gray{ type: "button", "aria-label" => "Resolve all", "@click" => "updateAll", ":disabled" => "loading" }
|
||||
= icon("spinner spin", "v-show" => "loading")
|
||||
{{ buttonText }}
|
||||
%span.line-resolve-text
|
||||
{{ resolved }}/{{ commentsCount }} comments resolved
|
||||
|
||||
- if @commits.nonzero?
|
||||
%ul.merge-request-tabs.nav-links.no-top.no-bottom
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
- access = note_max_access_for_user(note)
|
||||
- if access and not note.system
|
||||
%span.note-role.hidden-xs= access
|
||||
- unless note.system
|
||||
- if !note.system && current_user
|
||||
%resolve-btn{ ":endpoint" => "'#{resolve_namespace_project_note_path(note.project.namespace, note.project, note)}'", ":note-id" => note.id, ":resolved" => "false", "inline-template" => true, "v-ref:note_#{note.id}" => true }
|
||||
.note-action-button
|
||||
= icon("spin spinner", "v-show" => "loading")
|
||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue