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
Tatuya Kamada
gitlab-ce
Commits
9844c1f2
Commit
9844c1f2
authored
Jan 16, 2017
by
Martin Cabrera
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactored ‘from’ and ‘to’ variable preservation
parent
87c39b6d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
10 deletions
+6
-10
app/controllers/projects/compare_controller.rb
app/controllers/projects/compare_controller.rb
+6
-10
No files found.
app/controllers/projects/compare_controller.rb
View file @
9844c1f2
...
@@ -27,8 +27,11 @@ class Projects::CompareController < Projects::ApplicationController
...
@@ -27,8 +27,11 @@ 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"
from_to_preservation
=
from_to_hash
(
params
)
from_to_vars
=
{
redirect_to
namespace_project_compare_index_path
(
@project
.
namespace
,
@project
,
from_to_preservation
)
from:
params
[
:from
].
presence
,
to:
params
[
:to
].
presence
}
redirect_to
namespace_project_compare_index_path
(
@project
.
namespace
,
@project
,
from_to_vars
)
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,11 +65,4 @@ class Projects::CompareController < Projects::ApplicationController
...
@@ -62,11 +65,4 @@ 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
end
def
from_to_hash
(
params
)
\ No newline at end of file
return_hash
=
{}
return_hash
[
:from
]
=
params
[
:from
].
presence
return_hash
[
:to
]
=
params
[
:to
].
presence
return_hash
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