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
4a8a28eb
Commit
4a8a28eb
authored
Feb 17, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issue where files on a fork could not be edited
parent
a2801ec4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
31 deletions
+36
-31
app/controllers/concerns/creates_commit.rb
app/controllers/concerns/creates_commit.rb
+4
-12
spec/controllers/projects/blob_controller_spec.rb
spec/controllers/projects/blob_controller_spec.rb
+32
-19
No files found.
app/controllers/concerns/creates_commit.rb
View file @
4a8a28eb
...
...
@@ -104,22 +104,14 @@ module CreatesCommit
if
can?
(
current_user
,
:push_code
,
@project
)
# Edit file in this project
@mr_source_project
=
@project
if
@project
.
forked?
# Merge request from this project to fork origin
@mr_target_project
=
@project
.
forked_from_project
@mr_target_branch
=
@mr_target_project
.
repository
.
root_ref
else
# Merge request to this project
@mr_target_project
=
@project
@mr_target_branch
=
@ref
||
@target_branch
end
else
# Merge request from fork to this project
@mr_source_project
=
current_user
.
fork_of
(
@project
)
end
# Merge request to this project
@mr_target_project
=
@project
@mr_target_branch
=
@ref
||
@target_branch
end
@mr_source_branch
=
guess_mr_source_branch
end
...
...
spec/controllers/projects/blob_controller_spec.rb
View file @
4a8a28eb
...
...
@@ -92,12 +92,24 @@ describe Projects::BlobController do
before
{
sign_in
(
guest
)
}
context
'when editing on the fork'
do
before
do
default_params
[
:namespace_id
]
=
forked_project
.
namespace
.
to_param
default_params
[
:project_id
]
=
forked_project
.
to_param
end
it
'redirects to blob'
do
put
:update
,
default_params
expect
(
response
).
to
redirect_to
(
namespace_project_blob_path
(
forked_project
.
namespace
,
forked_project
,
'master/CHANGELOG'
))
end
end
context
'when editing on the original repository'
do
it
"redirects to forked project new merge request"
do
default_params
[
:target_branch
]
=
"fork-test-1"
default_params
[
:create_merge_request
]
=
1
allow_any_instance_of
(
Files
::
UpdateService
).
to
receive
(
:commit
).
and_return
(
:success
)
put
:update
,
default_params
expect
(
response
).
to
redirect_to
(
...
...
@@ -115,4 +127,5 @@ describe Projects::BlobController do
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