Skip to content
Snippets Groups Projects
Commit e2b6e9c3 authored by Jacob Schatz's avatar Jacob Schatz
Browse files

Add ajax calls to return JSON

Fix subtitles on minimize.
Fix styles for show.
parent 541fcc37
No related branches found
No related tags found
1 merge request!2645Implement new design for issue and merge request right sidebar
Pipeline #
Loading
Loading
@@ -116,7 +116,7 @@
display: none;
}
 
aside {
aside:not(.right-sidebar){
display: none;
}
 
Loading
Loading
Loading
Loading
@@ -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;
}
Loading
Loading
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -57,6 +57,5 @@
%section.col-md-12
.issuable-discussion
= render 'projects/issues/discussion'
= render 'shared/show_aside'
 
= render 'shared/issuable/sidebar', issuable: @issue
\ No newline at end of file
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment