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
Jérome Perrin
gitlab-ce
Commits
0413a7ad
Commit
0413a7ad
authored
Jan 15, 2017
by
Martin Cabrera
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
from or to get variables gets preserved if the other one is missing
parent
241e2e87
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
app/controllers/projects/compare_controller.rb
app/controllers/projects/compare_controller.rb
+9
-2
No files found.
app/controllers/projects/compare_controller.rb
View file @
0413a7ad
...
@@ -27,8 +27,8 @@ class Projects::CompareController < Projects::ApplicationController
...
@@ -27,8 +27,8 @@ class Projects::CompareController < Projects::ApplicationController
def
create
def
create
if
params
[
:from
].
blank?
||
params
[
:to
].
blank?
if
params
[
:from
].
blank?
||
params
[
:to
].
blank?
flash
[
:alert
]
=
"You must select from and to branches"
flash
[
:alert
]
=
"You must select from and to branches"
byebug
from_to_preservation
=
from_to_hash
(
params
)
redirect_to
namespace_project_compare_index_path
redirect_to
namespace_project_compare_index_path
(
@project
.
namespace
,
@project
,
from_to_preservation
)
else
else
redirect_to
namespace_project_compare_path
(
@project
.
namespace
,
@project
,
redirect_to
namespace_project_compare_path
(
@project
.
namespace
,
@project
,
params
[
:from
],
params
[
:to
])
params
[
:from
],
params
[
:to
])
...
@@ -62,4 +62,11 @@ class Projects::CompareController < Projects::ApplicationController
...
@@ -62,4 +62,11 @@ class Projects::CompareController < Projects::ApplicationController
@merge_request
||=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
.
opened
.
@merge_request
||=
MergeRequestsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
.
opened
.
find_by
(
source_project:
@project
,
source_branch:
@head_ref
,
target_branch:
@start_ref
)
find_by
(
source_project:
@project
,
source_branch:
@head_ref
,
target_branch:
@start_ref
)
end
end
def
from_to_hash
(
params
)
return_hash
=
{}
return_hash
[
:from
]
=
params
[
:from
].
presence
return_hash
[
:to
]
=
params
[
:to
].
presence
return_hash
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