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
Léo-Paul Géneau
gitlab-ce
Commits
2feb9eb1
Commit
2feb9eb1
authored
Feb 29, 2016
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change icons for open close on issue/MR
Button full width on phone on MR/issue.
parent
954b9837
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
46 additions
and
21 deletions
+46
-21
CHANGELOG
CHANGELOG
+1
-0
app/assets/stylesheets/pages/detail_page.scss
app/assets/stylesheets/pages/detail_page.scss
+1
-1
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+3
-4
app/models/merge_request.rb
app/models/merge_request.rb
+10
-0
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+26
-15
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+5
-1
No files found.
CHANGELOG
View file @
2feb9eb1
...
@@ -20,6 +20,7 @@ v 8.5.3
...
@@ -20,6 +20,7 @@ v 8.5.3
- Flush repository caches before renaming projects
- Flush repository caches before renaming projects
- Sort starred projects on dashboard based on last activity by default
- Sort starred projects on dashboard based on last activity by default
- Show commit message in JIRA mention comment
- Show commit message in JIRA mention comment
- Makes issue page and merge request page usable on mobile browsers.
v 8.5.2
v 8.5.2
- Fix sidebar overlapping content when screen width was below 1200px
- Fix sidebar overlapping content when screen width was below 1200px
...
...
app/assets/stylesheets/pages/detail_page.scss
View file @
2feb9eb1
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
}
}
.issue-meta
{
.issue-meta
{
margin-left
:
65px
display
:
inline-block
;
}
}
}
}
...
...
app/assets/stylesheets/pages/issues.scss
View file @
2feb9eb1
...
@@ -99,18 +99,17 @@ form.edit-issue {
...
@@ -99,18 +99,17 @@ form.edit-issue {
.btn
{
.btn
{
width
:
100%
;
width
:
100%
;
margin-top
:
-1px
;
&
:first-child:not
(
:last-child
)
{
&
:first-child:not
(
:last-child
)
{
border-radius
:
4px
4px
0
0
;
}
}
&
:not
(
:first-child
)
:not
(
:last-child
)
{
&
:not
(
:first-child
)
:not
(
:last-child
)
{
border-radius
:
0
;
margin-top
:
10px
;
}
}
&
:last-child:not
(
:first-child
)
{
&
:last-child:not
(
:first-child
)
{
border-radius
:
0
0
4px
4
px
;
margin-top
:
10
px
;
}
}
}
}
}
}
...
...
app/models/merge_request.rb
View file @
2feb9eb1
...
@@ -490,6 +490,16 @@ class MergeRequest < ActiveRecord::Base
...
@@ -490,6 +490,16 @@ class MergeRequest < ActiveRecord::Base
end
end
end
end
def
state_icon_name
if
merged?
"check"
elsif
closed?
"times"
else
"circle-o"
end
end
def
target_sha
def
target_sha
@target_sha
||=
target_project
.
repository
.
commit
(
target_branch
).
sha
@target_sha
||=
target_project
.
repository
.
commit
(
target_branch
).
sha
end
end
...
...
app/views/projects/issues/show.html.haml
View file @
2feb9eb1
...
@@ -5,8 +5,32 @@
...
@@ -5,8 +5,32 @@
=
render
"header_title"
=
render
"header_title"
.issue
.issue
.detail-page-header
.detail-page-header.issuable-header
.pull-right
.pull-left
.status-box
{
class:
"status-box-closed #{issue_button_visibility(@issue, false)}"
}
%span
.hidden-xs
Closed
%span
.hidden-sm.hidden-md.hidden-lg
=
icon
(
'check'
)
.status-box
{
class:
"status-box-open #{issue_button_visibility(@issue, true)}"
}
%span
.hidden-xs
Open
%span
.hidden-sm.hidden-md.hidden-lg
=
icon
(
'circle-o'
)
.issue-meta
%strong
.identifier
Issue ##{@issue.iid}
%span
.creator
by
.editor-details
%strong
=
link_to_member
(
@project
,
@issue
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
)
=
link_to_member
(
@project
,
@issue
.
author
,
size:
24
,
by_username:
true
,
avatar:
false
)
=
time_ago_with_tooltip
(
@issue
.
created_at
,
placement:
'bottom'
,
html_class:
'issue_created_ago'
)
.pull-right.issue-btn-group
-
if
can?
(
current_user
,
:create_issue
,
@project
)
-
if
can?
(
current_user
,
:create_issue
,
@project
)
=
link_to
new_namespace_project_issue_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-nr btn-grouped new-issue-link btn-success'
,
title:
'New issue'
,
id:
'new_issue_link'
do
=
link_to
new_namespace_project_issue_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-nr btn-grouped new-issue-link btn-success'
,
title:
'New issue'
,
id:
'new_issue_link'
do
=
icon
(
'plus'
)
=
icon
(
'plus'
)
...
@@ -19,19 +43,6 @@
...
@@ -19,19 +43,6 @@
=
icon
(
'pencil-square-o'
)
=
icon
(
'pencil-square-o'
)
Edit
Edit
.pull-left
.status-box
{
class:
"status-box-closed #{issue_button_visibility(@issue, false)}"
}
Closed
.status-box
{
class:
"status-box-open #{issue_button_visibility(@issue, true)}"
}
Open
.issue-meta
%span
.identifier
Issue ##{@issue.iid}
%span
.creator
·
by
#{
link_to_member
(
@project
,
@issue
.
author
,
size:
24
)
}
=
'@'
+
@issue
.
author
.
username
·
=
time_ago_with_tooltip
(
@issue
.
created_at
,
placement:
'bottom'
,
html_class:
'issue_created_ago'
)
.issue-details.issuable-details
.issue-details.issuable-details
.detail-page-description.content-block
.detail-page-description.content-block
...
...
app/views/projects/merge_requests/show/_mr_title.html.haml
View file @
2feb9eb1
.detail-page-header
.detail-page-header
.status-box
{
class:
status_box_class
(
@merge_request
)
}
.status-box
{
class:
status_box_class
(
@merge_request
)
}
%span
.hidden-xs
=
@merge_request
.
state_human_name
=
@merge_request
.
state_human_name
%span
.hidden-sm.hidden-md.hidden-lg
=
icon
(
@merge_request
.
state_icon_name
)
%span
.identifier
%span
.identifier
Merge Request
#{
@merge_request
.
to_reference
}
Merge Request
#{
@merge_request
.
to_reference
}
%span
.creator
%span
.creator
...
...
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