diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-07 19:53:30 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-07 19:53:30 +0000 |
| commit | 2e074500b24ec22c0606d475e329888ffeba5de4 (patch) | |
| tree | 133ba32f76952216477ec7eb026e54ce4dbe6071 | |
| parent | 949a7e8e2016621a42696fc6fc8dbe3235869e0a (diff) | |
| parent | 2cec90254f5753ac1a8b92931613aaa6c9f19cf7 (diff) | |
| download | gitlab-ce-2e074500b24ec22c0606d475e329888ffeba5de4.tar.gz | |
Merge branch 'fix-parallel-merge' into 'master'
Dont use cached collection for Repository find_branch and find_tag methods
Fix for #3816
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !2003
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/repository.rb | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 03857bb6f03..604efe51a3a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,7 @@ v 8.3.0 (unreleased) - Expose events API with comment information and author info - Fix: Ensure "Remove Source Branch" button is not shown when branch is being deleted. #3583 - Run custom Git hooks when branch is created or deleted. + - Fix bug when simultaneously accepting multiple MRs results in MRs that are of "merged" status, but not merged to the target branch v 8.2.3 - Fix application settings cache not expiring after changes (Stan Hu) diff --git a/app/models/repository.rb b/app/models/repository.rb index c304955b0b3..1d43307e1e7 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -100,11 +100,11 @@ class Repository end def find_branch(name) - branches.find { |branch| branch.name == name } + raw_repository.branches.find { |branch| branch.name == name } end def find_tag(name) - tags.find { |tag| tag.name == name } + raw_repository.tags.find { |tag| tag.name == name } end def add_branch(user, branch_name, target) |