Age | Commit message (Collapse) | Author |
|
add parsing support for incoming html email
## What does this MR do?
Fixes #18388 by adding support for parsing HTML email
## Are there points in the code the reviewer needs to double check?
The new class, Gitlab::Email::HTMLParser, which needs to translate the HTML content to text and also delete replies, as they are not necessarily in the correct format to be caught by EmailReplyParser. The solution I found that should work for any HTML-formatted email is to remove all `<table>` and `<blockquote>` tags. Actual `<table>` elements (to be interpreted by markdown) should already be encoded with e.g. `<table>` - the only failure mode is if there is an *actual* HTML table in the content itself, which we wouldn't be able to support easily anyways.
The gem `html2text` traverses the HTML tree and outputs text - and markdown in the case of HTML links or images.
See merge request !7397
|
|
|
|
We use the Redis-backed session store from `redis-store` so this is
unnecessary.
|
|
|
|
|
|
Closes gitlab-com/support-forum#1270
|
|
This update adds support for Rails 5. Also update redis-rails dependencies.
|
|
Updates deckar01-task_list gem to its latest version
See merge request !7185
|
|
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2814
|
|
This was the only thing using the `sdoc` gem, which was blocking another
gem from updating.
|
|
Update diffy gem to 3.1.0
See merge request !7184
|
|
Updates rack-attack gem to 4.4.1
See merge request !7186
|
|
ChangeLog: https://github.com/samg/diffy/blob/master/CHANGELOG
|
|
ChangeLog: https://github.com/deckar01/task_list/compare/1.0.5...1.0.6
|
|
See: https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md
|
|
When we updated gitlab_git to 10.4.1, `tag.target` changed from pointing
to the sha of the tag to the sha of the commit the tag points to. The
problem is that only annotated tags have `object_sha`s, lightweight tags
don't (it's nil), so (only) in their case we still need to use
`tag.target`.
|
|
Jira refactoring to jira gem
part of gitlab-org/gitlab-ee#1008
Original MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2572/commits
See merge request !6598
|
|
|
|
Code improvements, bug fixes, finish documentation and specs
|
|
|
|
|
|
for IdP auto-configuration.
|
|
|
|
Loosen requirement on request_store version
This gem follows semantic versioning and will not introduce breaking
changes in a minor version. See
https://github.com/steveklabnik/request_store#semantic-versioning
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2868
See merge request !6853
|
|
This gem follows semantic versioning and will not introduce breaking
changes in a minor version. See
https://github.com/steveklabnik/request_store#semantic-versioning
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2868
|
|
|
|
|
|
Improve merge request versions compare logic
## What does this MR do?
Changes the way how we compare between for merge request versions
## Are there points in the code the reviewer needs to double check?
no
## Why was this MR needed?
So when I squash+rebase my commit I can get more accurate diff on what changed between versions
## Screenshots (if relevant)
in discussion (below)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [ ] ~~API support added~~
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/22368, https://gitlab.com/gitlab-org/gitlab-ce/issues/22721
See merge request !6589
|
|
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22278
|
|
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Update mail_room gem
## What does this MR do?
Upgrades the mail_room gem from 0.8.0 to 0.8.1.
## Why was this MR needed?
mail_room throws an exception if the watching script joins a undefined thread. Release 0.8.1 adds a check to ensure that the thread exists before calling join.
Fixes gitlab-org/omnibus-gitlab#1619.
See merge request !6714
|
|
Truncato is introduced as a dependency to intelligently shorten the rendered
HTML to 200 characters; the previous approach could have resulted in invalid
HTML being rendered.
|
|
|
|
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22537
|
|
`Style/VariableNumber` is explicitly disabled because I don't think we
care if we name a variable `var_1` or `var1`.
|
|
Changelog: https://github.com/mbleigh/acts-as-taggable-on/blob/master/CHANGELOG.md#400--2016-08-08
|
|
|
|
|
|
|
|
Upgrade Devise from 4.1.1 to 4.2.0.
This fixes an issue with Rails 5 and brings us up-to-date with the latest Devise release. It also deprecates `Devise::TestHelpers` in favor of `Devise::Test::ControllerHelpers`.
Changelog: https://github.com/plataformatec/devise/blob/v4.2.0/CHANGELOG.md#420---2016-07-01
Working toward #14286, as always.
See merge request !6461
|
|
|
|
This solve issues with ruby builds with rubygems preload
see https://github.com/ruby-prof/ruby-prof/pull/191
Signed-off-by: Rémy Coutable <remy@rymai.me>
|
|
This fixes an issue with Rails 5 and brings us up-to-date with the latest Devise release.
This also replaces the deprecated Devise::TestHelpers with Devise::Test::ControllerHelpers.
Changelog: https://github.com/plataformatec/devise/blob/v4.2.0/CHANGELOG.md#420---2016-07-01
|
|
Remove Sprockets deprecation warning
See merge request !6535
|
|
Upgrade unicorn and unicorn-worker-killer.
Upgrade unicorn from 4.9.0 to 5.1.0 and unicorn-worker-killer from 0.4.2 to 0.4.4. This includes Rack 2.0 support which is necessary for Rails 5.
Changelog for unicorn: http://unicorn.bogomips.org/NEWS.html
Changelog for unicorn-worker-killer: https://github.com/kzk/unicorn-worker-killer/blob/bdec225f028d1bda01b5888578c479b0c705f1a8/ChangeLog
See merge request !6463
|
|
|
|
update sprockets version
|
|
|