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
iv
gitlab-ce
Commits
8c46123f
Commit
8c46123f
authored
12 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed merge request diffissues 355, 351
parent
fde29a82
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/assets/stylesheets/commits.css.scss
app/assets/stylesheets/commits.css.scss
+1
-2
app/controllers/merge_requests_controller.rb
app/controllers/merge_requests_controller.rb
+1
-0
No files found.
app/assets/stylesheets/commits.css.scss
View file @
8c46123f
...
...
@@ -89,6 +89,7 @@ body.project-page.commits-page .commits-date a.commit span.commit-author strong{
float
:left
;
width
:
35px
;
font-weight
:normal
;
color
:
#888
;
&
:hover
{
text-decoration
:underline
;
}
...
...
@@ -139,8 +140,6 @@ ul.bordered-list {
ul
.bordered-list
li
:last-child
{
border
:none
}
.line_holder
{
cursor
:pointer
;
&
:hover
{
td
{
background
:
#FFFFCF
!
important
;
...
...
This diff is collapsed.
Click to expand it.
app/controllers/merge_requests_controller.rb
View file @
8c46123f
...
...
@@ -45,6 +45,7 @@ class MergeRequestsController < ApplicationController
def
diffs
@diffs
=
@merge_request
.
diffs
@commit
=
@merge_request
.
last_commit
@line_notes
=
[]
end
def
new
...
...
This diff is collapsed.
Click to expand it.
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