diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-10-22 16:18:56 +0200 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-10-22 16:18:56 +0200 |
commit | 82f174217e0515576f2bd53fc836995e5daaa333 (patch) | |
tree | 4365cce9e9af510a07fb254131bc3f463d97dace /scripts/frontend | |
parent | 38b9ddeaeb5e8ef0d08137cb2795d510811ac989 (diff) | |
download | gitlab-ce-82f174217e0515576f2bd53fc836995e5daaa333.tar.gz |
Backport rescue in Project#import_url from EEbackport-ee-import-url-rescue
EE added a `rescue` to the method Project#import_url, which could cause
merge conflicts when changing this method. This commit backports those
changes to CE, reducing the chances of running into a merge conflict.
Diffstat (limited to 'scripts/frontend')
0 files changed, 0 insertions, 0 deletions