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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
280afe0a
Commit
280afe0a
authored
Nov 29, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix blob controller spec failure - updated not to use file-path-
parent
25e1bbd1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/controllers/projects/blob_controller.rb
app/controllers/projects/blob_controller.rb
+1
-1
spec/controllers/projects/blob_controller_spec.rb
spec/controllers/projects/blob_controller_spec.rb
+1
-1
No files found.
app/controllers/projects/blob_controller.rb
View file @
280afe0a
...
@@ -119,7 +119,7 @@ class Projects::BlobController < Projects::ApplicationController
...
@@ -119,7 +119,7 @@ class Projects::BlobController < Projects::ApplicationController
from_merge_request
=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
.
find_by
(
iid:
params
[
:from_merge_request_iid
])
from_merge_request
=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
.
find_by
(
iid:
params
[
:from_merge_request_iid
])
if
from_merge_request
&&
@target_branch
==
@ref
if
from_merge_request
&&
@target_branch
==
@ref
diffs_namespace_project_merge_request_path
(
from_merge_request
.
target_project
.
namespace
,
from_merge_request
.
target_project
,
from_merge_request
)
+
diffs_namespace_project_merge_request_path
(
from_merge_request
.
target_project
.
namespace
,
from_merge_request
.
target_project
,
from_merge_request
)
+
"#
file-path-
#{
hexdigest
(
@path
)
}
"
"#
#{
hexdigest
(
@path
)
}
"
else
else
namespace_project_blob_path
(
@project
.
namespace
,
@project
,
File
.
join
(
@target_branch
,
@path
))
namespace_project_blob_path
(
@project
.
namespace
,
@project
,
File
.
join
(
@target_branch
,
@path
))
end
end
...
...
spec/controllers/projects/blob_controller_spec.rb
View file @
280afe0a
...
@@ -67,7 +67,7 @@ describe Projects::BlobController do
...
@@ -67,7 +67,7 @@ describe Projects::BlobController do
put
:update
,
mr_params
put
:update
,
mr_params
after_edit_path
=
diffs_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
after_edit_path
=
diffs_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
file_anchor
=
"#
file-path-
#{
Digest
::
SHA1
.
hexdigest
(
'CHANGELOG'
)
}
"
file_anchor
=
"#
#{
Digest
::
SHA1
.
hexdigest
(
'CHANGELOG'
)
}
"
expect
(
response
).
to
redirect_to
(
after_edit_path
+
file_anchor
)
expect
(
response
).
to
redirect_to
(
after_edit_path
+
file_anchor
)
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