diff options
| author | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-08-25 16:08:31 +0300 |
|---|---|---|
| committer | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-08-30 14:05:40 +0300 |
| commit | 7226631102ef00c2d880bc6c1e099e52f4fa8659 (patch) | |
| tree | bb35a5c9d4a8a83038057d8b6dbe9b1446331e25 | |
| parent | 4f8a823e64f9ba3e2c8ef4da8dddaab7b6f7fc3d (diff) | |
Improve grammar and fix CHANGELOG
| -rw-r--r-- | CHANGELOG | 8 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 1979158d439..c5d035661b1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -53,6 +53,13 @@ v 8.11.2 - Show "Create Merge Request" widget for push events to fork projects on the source project. !5978 - Use gitlab-workhorse 0.7.11 !5983 - 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 - Fixed enter key in search input not working !5888 @@ -217,7 +224,6 @@ v 8.11.0 v 8.10.7 - Upgrade Hamlit to 2.6.1. !5873 - Upgrade Doorkeeper to 4.2.0. !5881 - - User can edit closed MR with deleted fork (Katarzyna Kobierska Ula Budziszewska) !5496 v 8.10.6 - Upgrade Rails to 4.2.7.1 for security fixes. !5781 diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index b41a1f0c547..27ca5d119d5 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -309,7 +309,7 @@ class MergeRequest < ActiveRecord::Base return true unless fork_missing? errors.add :validate_fork, - 'Source project is not a fork of target project' + 'Source project is not a fork of the target project' end def closed_without_fork? |