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
7307fa48
Commit
7307fa48
authored
Jan 12, 2016
by
Rubén Dávila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken specs. #3945
parent
f547e733
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+2
-1
lib/gitlab/diff/highlight.rb
lib/gitlab/diff/highlight.rb
+1
-1
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
7307fa48
...
...
@@ -104,7 +104,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@commit
=
@merge_request
.
last_commit
@first_commit
=
@merge_request
.
first_commit
@diffs
=
@merge_request
.
compare_diffs
@diff_refs
=
[
@merge_request
.
target_sha
,
@merge_request
.
source_sha
]
# We need to use #source_branch because #source_sha requires an existent MergeRequestDiff object.
@diff_refs
=
[
@merge_request
.
target_sha
,
@merge_request
.
source_branch
]
@ci_commit
=
@merge_request
.
ci_commit
@statuses
=
@ci_commit
.
statuses
if
@ci_commit
...
...
lib/gitlab/diff/highlight.rb
View file @
7307fa48
...
...
@@ -73,7 +73,7 @@ module Gitlab
# Only update text if line is found. This will prevent
# issues with submodules given the line only exists in diff content.
line
.
text
=
highlighted_line
.
gsub!
(
/\A\s/
,
line_prefix
)
if
line
line
.
text
=
highlighted_line
.
gsub!
(
/\A\s/
,
line_prefix
)
if
highlighted_
line
end
@lines
...
...
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