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
b995502d
Commit
b995502d
authored
Aug 25, 2017
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix MRs, added project restorer spec
parent
54e18d28
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/models/merge_request.rb
app/models/merge_request.rb
+1
-1
ee/app/models/ee/project.rb
ee/app/models/ee/project.rb
+1
-2
spec/lib/gitlab/import_export/project.json
spec/lib/gitlab/import_export/project.json
+2
-1
No files found.
app/models/merge_request.rb
View file @
b995502d
...
...
@@ -99,7 +99,7 @@ class MergeRequest < ActiveRecord::Base
validates
:merge_user
,
presence:
true
,
if: :merge_when_pipeline_succeeds?
,
unless: :importing?
validate
:validate_branches
,
unless:
[
:allow_broken
,
:importing?
,
:closed_without_fork?
]
validate
:validate_fork
,
unless: :closed_without_fork?
validate
:validate_approvals_before_merge
validate
:validate_approvals_before_merge
,
unless: :importing?
validate
:validate_target_project
,
on: :create
scope
:by_source_or_target_branch
,
->
(
branch_name
)
do
...
...
ee/app/models/ee/project.rb
View file @
b995502d
...
...
@@ -8,7 +8,6 @@ module EE
prepended
do
include
Elastic
::
ProjectsSearch
include
Importable
prepend
GeoAwareAvatar
prepend
ImportStatusStateMachine
...
...
@@ -54,7 +53,7 @@ module EE
validates
:repository_size_limit
,
numericality:
{
only_integer:
true
,
greater_than_or_equal_to:
0
,
allow_nil:
true
}
validates
:approvals_before_merge
,
numericality:
true
,
allow_blank:
true
,
unless: :importing?
validates
:approvals_before_merge
,
numericality:
true
,
allow_blank:
true
accepts_nested_attributes_for
:remote_mirrors
,
allow_destroy:
true
,
...
...
spec/lib/gitlab/import_export/project.json
View file @
b995502d
...
...
@@ -2967,7 +2967,8 @@
"action"
:
1
,
"author_id"
:
1
}
]
],
"approvals_before_merge"
:
1
},
{
"id"
:
26
,
...
...
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