Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
e2b6e9c3
Commit
e2b6e9c3
authored
Jan 30, 2016
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add ajax calls to return JSON
Fix subtitles on minimize. Fix styles for show.
parent
541fcc37
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
5 deletions
+14
-5
app/assets/stylesheets/framework/mobile.scss
app/assets/stylesheets/framework/mobile.scss
+1
-1
app/assets/stylesheets/framework/sidebar.scss
app/assets/stylesheets/framework/sidebar.scss
+9
-0
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+3
-1
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+0
-1
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+0
-1
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/mobile.scss
View file @
e2b6e9c3
...
@@ -116,7 +116,7 @@
...
@@ -116,7 +116,7 @@
display
:
none
;
display
:
none
;
}
}
aside
{
aside
:not
(
.right-sidebar
)
{
display
:
none
;
display
:
none
;
}
}
...
...
app/assets/stylesheets/framework/sidebar.scss
View file @
e2b6e9c3
...
@@ -284,6 +284,15 @@
...
@@ -284,6 +284,15 @@
@include
collapsed-sidebar
;
@include
collapsed-sidebar
;
}
}
.page-gutter
{
&
.right-sidebar-collapsed
{
@include
collapsed-gutter
;
}
&
.right-sidebar-expanded
{
@include
expanded-gutter
;
}
}
.collapse-nav
{
.collapse-nav
{
display
:
none
;
display
:
none
;
}
}
...
...
app/controllers/projects/issues_controller.rb
View file @
e2b6e9c3
...
@@ -98,7 +98,9 @@ class Projects::IssuesController < Projects::ApplicationController
...
@@ -98,7 +98,9 @@ class Projects::IssuesController < Projects::ApplicationController
format
.
json
do
format
.
json
do
render
json:
{
render
json:
{
saved:
@issue
.
valid?
,
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
end
end
...
...
app/views/projects/issues/show.html.haml
View file @
e2b6e9c3
...
@@ -57,6 +57,5 @@
...
@@ -57,6 +57,5 @@
%section
.col-md-12
%section
.col-md-12
.issuable-discussion
.issuable-discussion
=
render
'projects/issues/discussion'
=
render
'projects/issues/discussion'
=
render
'shared/show_aside'
=
render
'shared/issuable/sidebar'
,
issuable:
@issue
=
render
'shared/issuable/sidebar'
,
issuable:
@issue
\ No newline at end of file
app/views/projects/merge_requests/_show.html.haml
View file @
e2b6e9c3
...
@@ -73,7 +73,6 @@
...
@@ -73,7 +73,6 @@
%section
.col-md-12
%section
.col-md-12
.issuable-discussion
.issuable-discussion
=
render
"projects/merge_requests/discussion"
=
render
"projects/merge_requests/discussion"
=
render
'shared/show_aside'
#commits
.commits.tab-pane
#commits
.commits.tab-pane
-
# This tab is always loaded via AJAX
-
# This tab is always loaded via AJAX
...
...
app/views/shared/issuable/_sidebar.html.haml
View file @
e2b6e9c3
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
%a
.btn.btn-default.disabled
{
href:
'#'
}
%a
.btn.btn-default.disabled
{
href:
'#'
}
Next
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
.block.assignee
.sidebar-collapsed-icon
.sidebar-collapsed-icon
-
if
issuable
.
assignee
-
if
issuable
.
assignee
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment