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
8f52501e
Commit
8f52501e
authored
Jun 12, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix inline diff issue. See #3150
parent
5d092945
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
app/controllers/commit_controller.rb
app/controllers/commit_controller.rb
+1
-1
lib/gitlab/inline_diff.rb
lib/gitlab/inline_diff.rb
+3
-4
No files found.
app/controllers/commit_controller.rb
View file @
8f52501e
...
@@ -11,7 +11,7 @@ class CommitController < ProjectResourceController
...
@@ -11,7 +11,7 @@ class CommitController < ProjectResourceController
result
=
CommitLoadContext
.
new
(
project
,
current_user
,
params
).
execute
result
=
CommitLoadContext
.
new
(
project
,
current_user
,
params
).
execute
@commit
=
result
[
:commit
]
@commit
=
result
[
:commit
]
if
@commit
.
nil?
if
@commit
.
nil?
git_not_found!
git_not_found!
return
return
...
...
lib/gitlab/inline_diff.rb
View file @
8f52501e
...
@@ -21,8 +21,9 @@ module Gitlab
...
@@ -21,8 +21,9 @@ module Gitlab
end
end
end
end
first_token
=
first_line
[
0
..
first_the_same_symbols
][
1
..-
1
]
first_token
=
first_line
[
0
..
first_the_same_symbols
][
1
..-
1
]
diff_arr
[
index
+
1
].
sub!
(
first_token
,
first_token
+
START
)
start
=
first_token
+
START
diff_arr
[
index
+
2
].
sub!
(
first_token
,
first_token
+
START
)
diff_arr
[
index
+
1
].
sub!
(
first_token
,
first_token
=>
start
)
diff_arr
[
index
+
2
].
sub!
(
first_token
,
first_token
=>
start
)
last_the_same_symbols
=
0
last_the_same_symbols
=
0
(
1
..
max_length
+
1
).
each
do
|
i
|
(
1
..
max_length
+
1
).
each
do
|
i
|
last_the_same_symbols
=
-
i
last_the_same_symbols
=
-
i
...
@@ -60,8 +61,6 @@ module Gitlab
...
@@ -60,8 +61,6 @@ module Gitlab
line
.
gsub!
(
FINISH
,
"</span>"
)
line
.
gsub!
(
FINISH
,
"</span>"
)
line
line
end
end
end
end
end
end
end
end
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