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
fc747dc3
Commit
fc747dc3
authored
Jul 06, 2016
by
tiagonbotelho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes merge request edit bug where it would generate a cloned file and not remove the previous one
parent
6a3d05a9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
Gemfile.lock
Gemfile.lock
+0
-1
app/controllers/projects/blob_controller.rb
app/controllers/projects/blob_controller.rb
+5
-0
No files found.
Gemfile.lock
View file @
fc747dc3
...
@@ -432,7 +432,6 @@ GEM
...
@@ -432,7 +432,6 @@ GEM
mail_room (0.8.0)
mail_room (0.8.0)
method_source (0.8.2)
method_source (0.8.2)
mime-types (2.99.2)
mime-types (2.99.2)
mime-types-data (3.2016.0521)
mimemagic (0.3.1)
mimemagic (0.3.1)
mini_portile2 (2.1.0)
mini_portile2 (2.1.0)
minitest (5.7.0)
minitest (5.7.0)
...
...
app/controllers/projects/blob_controller.rb
View file @
fc747dc3
...
@@ -38,6 +38,11 @@ class Projects::BlobController < Projects::ApplicationController
...
@@ -38,6 +38,11 @@ class Projects::BlobController < Projects::ApplicationController
end
end
def
update
def
update
unless
params
[
:file_name
].
empty?
@previous_path
=
@path
@path
=
params
[
:file_name
]
end
after_edit_path
=
after_edit_path
=
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
)
+
...
...
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