delta/gitlab/gitlab-ce.git/Gemfile, branch process-commit-worker-improvements gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'add-stackprof' into 'master' 2016-11-30T05:29:29+00:00 Robert Speicher robert@gitlab.com 2016-11-30T05:29:29+00:00 4ecb95949230e2a7000b129a35096e25d0c6572c Add StackProf to the Gemfile, along with a utility to get a profile for a spec The test suite needs speeding up significantly. This is one tool for investigating it. Related to #23034 See merge request !7784 

Add StackProf to the Gemfile, along with a utility to get a profile for a spec

The test suite needs speeding up significantly. This is one tool for investigating it.

Related to #23034

See merge request !7784
 Add StackProf to the Gemfile, along with a utility to get a profile for a spec 2016-11-29T14:14:34+00:00 Nick Thomas nick@gitlab.com 2016-11-04T11:43:02+00:00 5e05f9c5c2cfaf14cc0337c23ff54f86c5d5f5a8 






Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1
2016-11-29T13:55:52+00:00

Stan Hu
stanhu@gmail.com

2016-11-29T07:38:14+00:00

49491e63b818b757bd05c9b1d0b447f1baf30db0

The "Enqueue Now" button would not work in the admin panel due to
changes in the Web extension interface.

Closes #24376





The "Enqueue Now" button would not work in the admin panel due to
changes in the Web extension interface.

Closes #24376







Merge branch 'zj-upgrade-grape' into 'master'

2016-11-25T04:05:17+00:00

Robert Speicher
robert@gitlab.com

2016-11-25T04:05:17+00:00

5522b9dc0e488a4561e7791c8d85e39615da2901


Update grape-entity to 0.6.0

See merge request !7491





Update grape-entity to 0.6.0

See merge request !7491






Stop supporting Google and Azure as backup strategies
2016-11-24T12:07:24+00:00

Rémy Coutable
remy@rymai.me

2016-11-24T12:05:00+00:00

2749c1b5687bb50b980dc7bfc1d3471ea16f1ccf

The amount of gems required is quite high compared to the usefulness
of the features.

Related to !4928, !6713

Signed-off-by: Rémy Coutable <remy@rymai.me>





The amount of gems required is quite high compared to the usefulness
of the features.

Related to !4928, !6713

Signed-off-by: Rémy Coutable <remy@rymai.me>







Upgrade grape-entity to 0.6.0
2016-11-23T15:58:39+00:00

Z.J. van de Weg
git@zjvandeweg.nl

2016-11-21T08:09:19+00:00

42fe0cac09fc335a8704b23bfbd219645914ee41












Upgrade grape-entity
2016-11-21T08:02:49+00:00

Z.J. van de Weg
git@zjvandeweg.nl

2016-11-15T21:57:28+00:00

f50fdacae4fa1b6313ec9c36541749678267a082

Fixes gitlab-org/gitlab-ce#14329





Fixes gitlab-org/gitlab-ce#14329







Merge branch 'bugfix/html-only-mail' into 'master'

2016-11-18T17:15:56+00:00

Douwe Maan
douwe@gitlab.com

2016-11-18T17:15:56+00:00

2717675fbc10c97904e6a3eebf498d2c53fe5ce5


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. `&lt;table&gt;` - 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





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. `&lt;table&gt;` - 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






Remove unused nested_form gem
2016-11-17T09:55:04+00:00

Robert Speicher
rspeicher@gmail.com

2016-11-17T09:55:04+00:00

27db4bc062f6087d988b167f3643e9b8752c3cf3












Remove activerecord-session_store gem
2016-11-17T09:45:14+00:00

Robert Speicher
rspeicher@gmail.com

2016-11-17T09:45:14+00:00

3c8db237d9a436e8d305dea6fbc53c62d1aa641b

We use the Redis-backed session store from `redis-store` so this is
unnecessary.





We use the Redis-backed session store from `redis-store` so this is
unnecessary.