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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
72266311
Commit
72266311
authored
Aug 25, 2016
by
Katarzyna Kobierska
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve grammar and fix CHANGELOG
parent
4f8a823e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
CHANGELOG
CHANGELOG
+7
-1
app/models/merge_request.rb
app/models/merge_request.rb
+1
-1
No files found.
CHANGELOG
View file @
72266311
...
@@ -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
...
...
app/models/merge_request.rb
View file @
72266311
...
@@ -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 t
he t
arget project'
end
end
def
closed_without_fork?
def
closed_without_fork?
...
...
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