diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-09 09:14:38 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-09 09:14:38 +0100 |
| commit | b6ab735ad2e596007d8dc0123bf5e2e018e99df8 (patch) | |
| tree | 479d0fb7097caeeb132558b333cd2b8666118362 /app/models/merge_request.rb | |
| parent | fe5fe5242f67a7d91ff43659978892d507b71014 (diff) | |
| parent | f45bb52af643cd271d415317f40b5541b18ec634 (diff) | |
| download | gitlab-ce-38869-commitslist.tar.gz | |
Merge branch 'master' into 38869-commitslist38869-commitslist
* master: (83 commits)
Move cycle analytics banner into a vue file
Remove executable permissions on images to make docs lint happy
Sync up hard coded DN class in migration
Redefine `respond_to?` in light of `method_missing`
Make internal methods private
Leave bad DNs alone instead of raising errors
Refactor DN error classes
Add changelog entry for LDAP normalization
Add migration specs
Move migration to background
Update DN class in migration
Normalize values, reusing DN normalization code
Remove telephoneNumber format comment
Fix space stripping
Rename method to `to_normalized_s`
Refactor initialize method for clarity
Move downcasing to normalize method
Normalize existing persisted DNs
Resolve Rubocop offenses
Switch to new DN class
...
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 086226618e6..292122f779e 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -403,7 +403,7 @@ class MergeRequest < ActiveRecord::Base return false unless for_fork? return true unless source_project - !source_project.forked_from?(target_project) + !source_project.in_fork_network_of?(target_project) end def reopenable? @@ -477,7 +477,7 @@ class MergeRequest < ActiveRecord::Base end def check_if_can_be_merged - return unless unchecked? + return unless unchecked? && Gitlab::Database.read_write? can_be_merged = !broken? && project.repository.can_be_merged?(diff_head_sha, target_branch) |