diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2016-07-26 09:51:52 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2016-07-26 09:51:52 +0300 |
commit | b04f95a2edadd2f84bcecee59bf7001ff6362d00 (patch) | |
tree | 4c6ca2ce730f43668c68bbd11064f1af4cab31f8 /spec/lib/gitlab/email | |
parent | bd44f1419784ea98ad513f2f2f67ffeb94853c04 (diff) | |
parent | 68162ba900f1b9003fa3d07613333f201be8154a (diff) |
Merge remote-tracking branch 'upstream/master' into new-issue-by-email
* upstream/master: (620 commits)
Added '*.js.es6 gitlab-language=javascript' to .gitattributes
Fix CI status icon link underline
Update CHANGELOG after 8.10.1
Add CHANGELOG
Add es6 gem
Instrument Nokogiri parsing methods
Fix backup restore
Use project ID in repository cache to prevent stale data from persisting across projects
Add iid to MR API response
`WikiPage` should have a slug even when not persisted.
ES6ify all the things!
Make fork counter always clickable (!5463)
Revert "Merge branch '17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-…"
Fix CHANGELOG
Add spec for dashes in paths
Fix Error 500 when creating Wiki pages with hyphens or spaces
Add links to the real markdown.md file for all GFM examples
Remove magic comments from Ruby files (!5456)
Ignore invalid trusted proxies in X-Forwarded-For header
remove search_id for label dropdown filter
...
Diffstat (limited to 'spec/lib/gitlab/email')
-rw-r--r-- | spec/lib/gitlab/email/attachment_uploader_spec.rb | 1 | ||||
-rw-r--r-- | spec/lib/gitlab/email/email_shared_blocks.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/spec/lib/gitlab/email/attachment_uploader_spec.rb b/spec/lib/gitlab/email/attachment_uploader_spec.rb index 476a21bf996..08b2577ecc4 100644 --- a/spec/lib/gitlab/email/attachment_uploader_spec.rb +++ b/spec/lib/gitlab/email/attachment_uploader_spec.rb @@ -11,7 +11,6 @@ describe Gitlab::Email::AttachmentUploader, lib: true do link = links.first expect(link).not_to be_nil - expect(link[:is_image]).to be_truthy expect(link[:alt]).to eq("bricks") expect(link[:url]).to include("bricks.png") end diff --git a/spec/lib/gitlab/email/email_shared_blocks.rb b/spec/lib/gitlab/email/email_shared_blocks.rb index c1dc1003831..19298e261e3 100644 --- a/spec/lib/gitlab/email/email_shared_blocks.rb +++ b/spec/lib/gitlab/email/email_shared_blocks.rb @@ -10,7 +10,6 @@ shared_context :email_shared_context do [ { url: "uploads/image.png", - is_image: true, alt: "image", markdown: markdown } |