diff options
author | Phil Hughes <me@iamphill.com> | 2017-12-21 08:49:04 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-12-21 08:49:04 +0000 |
commit | 1e5083511197b8a2d01cc5556a13de27964f7941 (patch) | |
tree | c85d1364ce318dbb3c221cbf54f02222b420ff2d /lib/api/files.rb | |
parent | 5d8d72f18e9329978987fcb046467ceacd13c3ab (diff) | |
parent | 408b56bd948edc80b212cd8025bbbee921c69d6b (diff) | |
download | gitlab-ce-1e5083511197b8a2d01cc5556a13de27964f7941.tar.gz |
Merge branch 'winh-fix-transient-loadDiff-failure' into 'master'
Fix racing condition in Ajax call of merge_request_tabs_spec.js
Closes #35294
See merge request gitlab-org/gitlab-ce!16012
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions