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
6c8dded2
Commit
6c8dded2
authored
Nov 16, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix_trailing_title_space' of
https://gitlab.com/dblessing/gitlab-ce
parents
86ce64f0
752d5280
Changes
3
Show 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 @
6c8dded2
...
@@ -41,6 +41,7 @@ v 8.2.0 (unreleased)
...
@@ -41,6 +41,7 @@ v 8.2.0 (unreleased)
- Add ignore white space option in merge request diff and commit and compare view
- Add ignore white space option in merge request diff and commit and compare view
- Ability to add release notes (markdown text and attachments) to git tags (aka Releases)
- Ability to add release notes (markdown text and attachments) to git tags (aka Releases)
- Relative links from a repositories README.md now link to the default branch
- Relative links from a repositories README.md now link to the default branch
- 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 @
6c8dded2
...
@@ -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 @
6c8dded2
...
@@ -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