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
Jérome Perrin
gitlab-ce
Commits
2b4deed9
Commit
2b4deed9
authored
Nov 14, 2016
by
Alejandro Rodríguez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use `default_value_for` to handle null values in only_allow_merge_if_all_discussions_are_resolved
parent
7f151a78
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
4 deletions
+1
-4
app/models/project.rb
app/models/project.rb
+1
-4
No files found.
app/models/project.rb
View file @
2b4deed9
...
@@ -35,6 +35,7 @@ class Project < ActiveRecord::Base
...
@@ -35,6 +35,7 @@ class Project < ActiveRecord::Base
default_value_for
:builds_enabled
,
gitlab_config_features
.
builds
default_value_for
:builds_enabled
,
gitlab_config_features
.
builds
default_value_for
:wiki_enabled
,
gitlab_config_features
.
wiki
default_value_for
:wiki_enabled
,
gitlab_config_features
.
wiki
default_value_for
:snippets_enabled
,
gitlab_config_features
.
snippets
default_value_for
:snippets_enabled
,
gitlab_config_features
.
snippets
default_value_for
:only_allow_merge_if_all_discussions_are_resolved
,
false
after_create
:ensure_dir_exist
after_create
:ensure_dir_exist
after_create
:create_project_feature
,
unless: :project_feature
after_create
:create_project_feature
,
unless: :project_feature
...
@@ -1334,10 +1335,6 @@ class Project < ActiveRecord::Base
...
@@ -1334,10 +1335,6 @@ class Project < ActiveRecord::Base
end
end
end
end
def
only_allow_merge_if_all_discussions_are_resolved
super
||
false
end
private
private
def
pushes_since_gc_redis_key
def
pushes_since_gc_redis_key
...
...
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