diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-07-20 16:42:52 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-07-20 16:42:52 +0000 |
| commit | e8c147903b55fda14f503adf7efcf0b69c54fe67 (patch) | |
| tree | be10a98e7d57b41921c09ae1d64819f70cb16504 | |
| parent | 996ad35bedca4b8975a6f65fcbf5dbdb75cae278 (diff) | |
| parent | 5eeab9f0a62f4843dcef2a7fb2f7f67610bef22d (diff) | |
| download | gitlab-ce-e8c147903b55fda14f503adf7efcf0b69c54fe67.tar.gz | |
Merge branch 'gc-images-no-casing' into 'master'
GoogleCode importer: Do not care about casing of image file extensions
When a GoogleCode repository contains an attached image with an UPPERCASE file extension, it's not inlined.
/CC @DouweM
See merge request !1003
| -rw-r--r-- | lib/gitlab/google_code_import/importer.rb | 2 | ||||
| -rw-r--r-- | spec/fixtures/GoogleCodeProjectHosting.json | 5 | ||||
| -rw-r--r-- | spec/lib/gitlab/google_code_import/importer_spec.rb | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/lib/gitlab/google_code_import/importer.rb b/lib/gitlab/google_code_import/importer.rb index 70bfe059776..03c410726a5 100644 --- a/lib/gitlab/google_code_import/importer.rb +++ b/lib/gitlab/google_code_import/importer.rb @@ -327,7 +327,7 @@ module Gitlab link = "https://storage.googleapis.com/google-code-attachments/#{@repo.name}/issue-#{issue_id}/comment-#{comment_id}/#{filename}" text = "[#{filename}](#{link})" - text = "!#{text}" if filename =~ /\.(png|jpg|jpeg|gif|bmp|tiff)\z/ + text = "!#{text}" if filename =~ /\.(png|jpg|jpeg|gif|bmp|tiff)\z/i text end.compact end diff --git a/spec/fixtures/GoogleCodeProjectHosting.json b/spec/fixtures/GoogleCodeProjectHosting.json index d05e77271ae..67bb3bae5b7 100644 --- a/spec/fixtures/GoogleCodeProjectHosting.json +++ b/spec/fixtures/GoogleCodeProjectHosting.json @@ -382,6 +382,11 @@ "fileName" : "screenshot.png", "fileSize" : 0, "mimetype" : "image/png" + }, { + "attachmentId" : "001", + "fileName" : "screenshot1.PNG", + "fileSize" : 0, + "mimetype" : "image/x-png" } ] }, { "id" : 1, diff --git a/spec/lib/gitlab/google_code_import/importer_spec.rb b/spec/lib/gitlab/google_code_import/importer_spec.rb index c53ddeb87b5..f49cbb7f532 100644 --- a/spec/lib/gitlab/google_code_import/importer_spec.rb +++ b/spec/lib/gitlab/google_code_import/importer_spec.rb @@ -65,6 +65,7 @@ describe Gitlab::GoogleCodeImport::Importer do expect(issue.description).to include('all the best!') expect(issue.description).to include('[tint2_task_scrolling.diff](https://storage.googleapis.com/google-code-attachments/tint2/issue-169/comment-0/tint2_task_scrolling.diff)') expect(issue.description).to include('') + expect(issue.description).to include('') end it "imports issue comments" do |