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
Tatuya Kamada
gitlab-ce
Commits
117893ee
Commit
117893ee
authored
Sep 06, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix layout issues with blame table
Closes #21216
parent
ad599eb6
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
21 deletions
+8
-21
CHANGELOG
CHANGELOG
+1
-0
app/assets/stylesheets/framework/files.scss
app/assets/stylesheets/framework/files.scss
+3
-19
app/helpers/avatars_helper.rb
app/helpers/avatars_helper.rb
+2
-1
app/views/projects/blame/show.html.haml
app/views/projects/blame/show.html.haml
+2
-1
No files found.
CHANGELOG
View file @
117893ee
...
@@ -14,6 +14,7 @@ v 8.12.0 (unreleased)
...
@@ -14,6 +14,7 @@ v 8.12.0 (unreleased)
- Add `web_url` field to issue, merge request, and snippet API objects (Ben Boeckel)
- Add `web_url` field to issue, merge request, and snippet API objects (Ben Boeckel)
- Expose `sha` and `merge_commit_sha` in merge request API (Ben Boeckel)
- Expose `sha` and `merge_commit_sha` in merge request API (Ben Boeckel)
- Set path for all JavaScript cookies to honor GitLab's subdirectory setting !5627 (Mike Greiling)
- Set path for all JavaScript cookies to honor GitLab's subdirectory setting !5627 (Mike Greiling)
- Fix blame table layout width
- Fix bug where pagination is still displayed despite all todos marked as done (ClemMakesApps)
- Fix bug where pagination is still displayed despite all todos marked as done (ClemMakesApps)
- Center build stage columns in pipeline overview (ClemMakesApps)
- Center build stage columns in pipeline overview (ClemMakesApps)
- Rename behaviour to behavior in bug issue template for consistency (ClemMakesApps)
- Rename behaviour to behavior in bug issue template for consistency (ClemMakesApps)
...
...
app/assets/stylesheets/framework/files.scss
View file @
117893ee
...
@@ -94,7 +94,6 @@
...
@@ -94,7 +94,6 @@
&
.blame
{
&
.blame
{
table
{
table
{
border
:
none
;
border
:
none
;
box-shadow
:
none
;
margin
:
0
;
margin
:
0
;
}
}
tr
{
tr
{
...
@@ -108,19 +107,10 @@
...
@@ -108,19 +107,10 @@
border-right
:
none
;
border-right
:
none
;
}
}
}
}
img
.avatar
{
border
:
0
none
;
float
:
none
;
margin
:
0
;
padding
:
0
;
}
td
.blame-commit
{
td
.blame-commit
{
padding
:
0
10px
;
min-width
:
400px
;
background
:
$gray-light
;
background
:
$gray-light
;
min-width
:
350px
;
.commit-author-link
{
color
:
#888
;
}
}
}
td
.line-numbers
{
td
.line-numbers
{
float
:
none
;
float
:
none
;
...
@@ -133,12 +123,6 @@
...
@@ -133,12 +123,6 @@
}
}
td
.lines
{
td
.lines
{
padding
:
0
;
padding
:
0
;
code
{
font-family
:
$monospace_font
;
}
pre
{
margin
:
0
;
}
}
}
}
}
...
...
app/helpers/avatars_helper.rb
View file @
117893ee
...
@@ -14,7 +14,8 @@ module AvatarsHelper
...
@@ -14,7 +14,8 @@ module AvatarsHelper
avatar_icon
(
options
[
:user
]
||
options
[
:user_email
],
avatar_size
),
avatar_icon
(
options
[
:user
]
||
options
[
:user_email
],
avatar_size
),
class:
"avatar has-tooltip hidden-xs s
#{
avatar_size
}
"
,
class:
"avatar has-tooltip hidden-xs s
#{
avatar_size
}
"
,
alt:
"
#{
user_name
}
's avatar"
,
alt:
"
#{
user_name
}
's avatar"
,
title:
user_name
title:
user_name
,
data:
{
container:
'body'
}
)
)
if
options
[
:user
]
if
options
[
:user
]
...
...
app/views/projects/blame/show.html.haml
View file @
117893ee
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
%small
=
number_to_human_size
@blob
.
size
%small
=
number_to_human_size
@blob
.
size
.file-actions
.file-actions
=
render
"projects/blob/actions"
=
render
"projects/blob/actions"
.file-content.blame.code.js-syntax-highlight
.
table-responsive.
file-content.blame.code.js-syntax-highlight
%table
%table
-
current_line
=
1
-
current_line
=
1
-
@blame_groups
.
each
do
|
blame_group
|
-
@blame_groups
.
each
do
|
blame_group
|
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
%td
.blame-commit
%td
.blame-commit
.commit
.commit
-
commit
=
blame_group
[
:commit
]
-
commit
=
blame_group
[
:commit
]
=
author_avatar
(
commit
,
size:
36
)
.commit-row-title
.commit-row-title
%strong
%strong
=
link_to_gfm
truncate
(
commit
.
title
,
length:
35
),
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
commit
.
id
),
class:
"cdark"
=
link_to_gfm
truncate
(
commit
.
title
,
length:
35
),
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
commit
.
id
),
class:
"cdark"
...
...
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