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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
752d5280
Commit
752d5280
authored
Sep 14, 2015
by
Drew Blessing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix trailing space issue with merge requests and issues. Fixes #2514
parent
ca25289b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
CHANGELOG
CHANGELOG
+1
-0
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+3
-1
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+3
-1
No files found.
CHANGELOG
View file @
752d5280
...
@@ -30,6 +30,7 @@ v 8.2.0 (unreleased)
...
@@ -30,6 +30,7 @@ v 8.2.0 (unreleased)
- Fix incoming email config defaults
- Fix incoming email config defaults
- MR target branch is now visible on a list view when it is different from project's default one
- MR target branch is now visible on a list view when it is different from project's default one
- Improve Continuous Integration graphs page
- Improve Continuous Integration graphs page
- Fix trailing whitespace issue in merge request/issue title
v 8.1.4
v 8.1.4
- Fix bug where manually merged branches in a MR would end up with an empty diff (Stan Hu)
- Fix bug where manually merged branches in a MR would end up with an empty diff (Stan Hu)
...
...
app/controllers/projects/issues_controller.rb
View file @
752d5280
...
@@ -158,10 +158,12 @@ class Projects::IssuesController < Projects::ApplicationController
...
@@ -158,10 +158,12 @@ class Projects::IssuesController < Projects::ApplicationController
end
end
def
issue_params
def
issue_params
params
.
require
(
:issue
).
permit
(
p
ermitted
=
p
arams
.
require
(
:issue
).
permit
(
:title
,
:assignee_id
,
:position
,
:description
,
:title
,
:assignee_id
,
:position
,
:description
,
:milestone_id
,
:state_event
,
:task_num
,
label_ids:
[]
:milestone_id
,
:state_event
,
:task_num
,
label_ids:
[]
)
)
params
[
:issue
][
:title
].
strip!
if
params
[
:issue
][
:title
]
permitted
end
end
def
bulk_update_params
def
bulk_update_params
...
...
app/controllers/projects/merge_requests_controller.rb
View file @
752d5280
...
@@ -276,11 +276,13 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -276,11 +276,13 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
end
def
merge_request_params
def
merge_request_params
params
.
require
(
:merge_request
).
permit
(
p
ermitted
=
p
arams
.
require
(
:merge_request
).
permit
(
:title
,
:assignee_id
,
:source_project_id
,
:source_branch
,
:title
,
:assignee_id
,
:source_project_id
,
:source_branch
,
:target_project_id
,
:target_branch
,
:milestone_id
,
:target_project_id
,
:target_branch
,
:milestone_id
,
:state_event
,
:description
,
:task_num
,
label_ids:
[]
:state_event
,
:description
,
:task_num
,
label_ids:
[]
)
)
params
[
:merge_request
][
:title
].
strip!
if
params
[
:merge_request
][
:title
]
permitted
end
end
# Make sure merge requests created before 8.0
# Make sure merge requests created before 8.0
...
...
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