Add ajax calls to return JSON
Fix subtitles on minimize. Fix styles for show.
This commit is contained in:
parent
541fcc37bf
commit
e2b6e9c3c5
|
@ -116,7 +116,7 @@
|
|||
display: none;
|
||||
}
|
||||
|
||||
aside {
|
||||
aside:not(.right-sidebar){
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
|
|
@ -284,6 +284,15 @@
|
|||
@include collapsed-sidebar;
|
||||
}
|
||||
|
||||
.page-gutter {
|
||||
&.right-sidebar-collapsed {
|
||||
@include collapsed-gutter;
|
||||
}
|
||||
&.right-sidebar-expanded {
|
||||
@include expanded-gutter;
|
||||
}
|
||||
}
|
||||
|
||||
.collapse-nav {
|
||||
display: none;
|
||||
}
|
||||
|
|
|
@ -98,7 +98,9 @@ class Projects::IssuesController < Projects::ApplicationController
|
|||
format.json do
|
||||
render json: {
|
||||
saved: @issue.valid?,
|
||||
assignee_avatar_url: @issue.assignee.try(:avatar_url)
|
||||
assignee_avatar_url: @issue.assignee.try(:avatar_url),
|
||||
milestone: @issue.milestone.title,
|
||||
labels: @issue.labels.pluck(:id,:title,:color)
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
|
@ -57,6 +57,5 @@
|
|||
%section.col-md-12
|
||||
.issuable-discussion
|
||||
= render 'projects/issues/discussion'
|
||||
= render 'shared/show_aside'
|
||||
|
||||
= render 'shared/issuable/sidebar', issuable: @issue
|
|
@ -73,7 +73,6 @@
|
|||
%section.col-md-12
|
||||
.issuable-discussion
|
||||
= render "projects/merge_requests/discussion"
|
||||
= render 'shared/show_aside'
|
||||
|
||||
#commits.commits.tab-pane
|
||||
- # This tab is always loaded via AJAX
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
%a.btn.btn-default.disabled{href: '#'}
|
||||
Next
|
||||
|
||||
= form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, html: {class: 'issuable-context-form inline-update js-issuable-update'} do |f|
|
||||
= form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, html: {class: 'issuable-context-form inline-update js-issuable-update', 'data-type' => 'json'} do |f|
|
||||
.block.assignee
|
||||
.sidebar-collapsed-icon
|
||||
- if issuable.assignee
|
||||
|
|
Loading…
Reference in New Issue