diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-20 20:10:28 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-05-20 20:20:30 +0300 |
| commit | de8c7ed14f6eb93193d73662e2adac6132198bcc (patch) | |
| tree | 74674c42fbf9e5c1bd00b0a59d9b785ac78c3b78 /Gemfile | |
| parent | d53b4d5ba7694114ad76bdf417ffb85860817dd1 (diff) | |
Merge branch 'fix/url-refactor-from-ee' into 'master'
Update CE code to include some refactor done in EE to do with import url
This is simply updating the code to match EE and avoid further conflicts related to `import_data` and `import_url` changes made on EE only.
See merge request !4223
Diffstat (limited to 'Gemfile')
0 files changed, 0 insertions, 0 deletions