Commit 72266311 authored by Katarzyna Kobierska's avatar Katarzyna Kobierska

Improve grammar and fix CHANGELOG

parent 4f8a823e
No related merge requests found
...@@ -53,6 +53,13 @@ v 8.11.2 ...@@ -53,6 +53,13 @@ v 8.11.2
- Show "Create Merge Request" widget for push events to fork projects on the source project. !5978 - Show "Create Merge Request" widget for push events to fork projects on the source project. !5978
- Use gitlab-workhorse 0.7.11 !5983 - Use gitlab-workhorse 0.7.11 !5983
- Does not halt the GitHub import process when an error occurs. !5763 - Does not halt the GitHub import process when an error occurs. !5763
- User can edit closed MR with deleted fork (Katarzyna Kobierska Ula Budziszewska) !5496
v 8.11.2 (unreleased)
- Show "Create Merge Request" widget for push events to fork projects on the source project
v 8.11.1 (unreleased)
- Does not halt the GitHub import process when an error occurs
- Fix file links on project page when default view is Files !5933 - Fix file links on project page when default view is Files !5933
- Fixed enter key in search input not working !5888 - Fixed enter key in search input not working !5888
...@@ -217,7 +224,6 @@ v 8.11.0 ...@@ -217,7 +224,6 @@ v 8.11.0
v 8.10.7 v 8.10.7
- Upgrade Hamlit to 2.6.1. !5873 - Upgrade Hamlit to 2.6.1. !5873
- Upgrade Doorkeeper to 4.2.0. !5881 - Upgrade Doorkeeper to 4.2.0. !5881
- User can edit closed MR with deleted fork (Katarzyna Kobierska Ula Budziszewska) !5496
v 8.10.6 v 8.10.6
- Upgrade Rails to 4.2.7.1 for security fixes. !5781 - Upgrade Rails to 4.2.7.1 for security fixes. !5781
......
...@@ -309,7 +309,7 @@ class MergeRequest < ActiveRecord::Base ...@@ -309,7 +309,7 @@ class MergeRequest < ActiveRecord::Base
return true unless fork_missing? return true unless fork_missing?
errors.add :validate_fork, errors.add :validate_fork,
'Source project is not a fork of target project' 'Source project is not a fork of the target project'
end end
def closed_without_fork? def closed_without_fork?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment