Commit graph

13 commits

Author SHA1 Message Date
GitLab Bot
84727c8209 Add latest changes from gitlab-org/gitlab@master 2019-09-16 15:06:26 +00:00
Grzegorz Bizon
1068ec2e92 Merge branch '66741-remove-spec-rails_helper-rb' into 'master'
Remove spec/rails_helper.rb

Closes #66741

See merge request gitlab-org/gitlab-ce!32380
2019-09-03 13:48:17 +00:00
Ash McKenzie
19ff9d9899
Replace rails_helper.rb with spec_helper.rb
rails_helper.rb's only logic was to require
spec_helper.rb.
2019-08-30 12:26:18 +10:00
Brett Walker
ad05e48863 Add support for using a Camo proxy server
User images and videos will get proxied through
the Camo server in order to keep malicious
sites from collecting the IP address of users.
2019-08-23 23:44:53 -05:00
Thong Kuah
f540ffcef6 Add frozen_string_literal to spec/lib (part 1)
Using the sed script from
https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
2019-07-26 13:25:07 +12:00
Jarka Košanová
c8e24280c5 Simplify factories for services
- use predefined factories when creating
projects with services
- remove unnecessary arguments
2019-07-16 10:04:54 +02:00
Sean McGivern
1617aa2756
Allow emoji in label and milestone references
If we put the emoji filter before the reference filters, each emoji will
have a wrapper element that prevents the reference filter from detecting
the presence of the emoji.

As the emoji filter now runs after the reference filters, references
must contain a literal emoji, not the GitLab Flavored Markdown
versions (:100`, for example).

A weird side-effect is that if you have a label with the 100 emoji, and
a label named 💯, then trying to reference the latter will work (link
to the correct label), but will render with the 100 emoji. I'm
comfortable with that edge case, I think.
2019-06-07 10:05:57 +01:00
Cindy Pallares
b5b475c273
Merge branch 'security-xss-in-markdown-following-unrecognized-html-element' into 'master'
[master] XSS in markdown following unrecognized HTML element

Closes #2732

See merge request gitlab/gitlabhq!2599
2018-11-28 19:09:35 -05:00
Brett Walker
1d4785470d Resolve "Process urls with spaces in all markdown processing" 2018-09-08 04:21:30 +00:00
Robert Speicher
72a7b30c9f Change all :empty_project to :project 2017-08-02 17:47:31 -04:00
Jarka Kadlecova
7bee7b848a Support both internal and external issue trackers 2017-07-24 08:13:43 +02:00
Douwe Maan
fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
Adam Niedzielski
9da3076944 Improve support for external issue references 2017-06-30 14:47:53 +02:00