Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/Gemfile.lock
AgeCommit message (Collapse)Author
2016-11-18Merge branch 'bugfix/html-only-mail' into 'master' Douwe Maan
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
2016-11-18bump rouge to 2.0.7http://jneen.net/
CHANGELOG: https://github.com/jneen/rouge/blob/v2.0.7/CHANGELOG.md
2016-11-17Remove unused nested_form gemRobert Speicher
2016-11-17Remove activerecord-session_store gemRobert Speicher
We use the Redis-backed session store from `redis-store` so this is unnecessary.
2016-11-17add parsing support for incoming html emailhttp://jneen.net/
2016-11-10Allow certain Sidekiq jobs to be throttledPatricio Cano
2016-11-08Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2Stan Hu
Closes gitlab-com/support-forum#1270
2016-11-04Upgrade redis-rails from 4.0.0 to 5.0.1.Connor Shea
This update adds support for Rails 5. Also update redis-rails dependencies.
2016-11-04Merge branch 'update-task-list' into 'master' Rémy Coutable
Updates deckar01-task_list gem to its latest version See merge request !7185
2016-11-03Update rdoc to `~> 4.2`Robert Speicher
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2814
2016-11-03Remove unused `gitlab:generate_docs` Rake taskRobert Speicher
This was the only thing using the `sdoc` gem, which was blocking another gem from updating.
2016-11-02Merge branch 'update-diffy' into 'master' Rémy Coutable
Update diffy gem to 3.1.0 See merge request !7184
2016-11-02Merge branch 'update-rack-attack' into 'master' Rémy Coutable
Updates rack-attack gem to 4.4.1 See merge request !7186
2016-11-01Update diffy gem to 3.1.0Manuel Rüger
ChangeLog: https://github.com/samg/diffy/blob/master/CHANGELOG
2016-11-01Update deckar01-task_list gem to 1.0.6Manuel Rüger
ChangeLog: https://github.com/deckar01/task_list/compare/1.0.5...1.0.6
2016-11-01Update rack-attack gem to 4.4.1Manuel Rüger
See: https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md
2016-10-28Fix lightweight tags not processed correctly by GitTagPushServiceAlejandro Rodríguez
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`.
2016-10-28Merge branch 'issue_1008_1' into 'master' Sean McGivern
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
2016-10-27Upgrade jira-ruby gem versionFelipe Artur
2016-10-26Finish updates to use JIRA gemFelipe Artur
Code improvements, bug fixes, finish documentation and specs
2016-10-26Updated mail_room and added sentinel support to Reply by EmailGabriel Mazetto
2016-10-19Bump `omniauth-saml` to 1.7.0 to include security fixes and metadata support ↵Patricio Cano
for IdP auto-configuration.
2016-10-13Merge branch 'rs-loosen-request_store' into 'master' Dmitriy Zaporozhets
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
2016-10-13Loosen requirement on request_store versionRobert Speicher
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
2016-10-13Updated gitlab-markup forked gem to download from rubygemsGabriel Mazetto
2016-10-13Use forked github-markup gem to enable python3 support with omnibusGabriel Mazetto
2016-10-12Merge branch 'dz-improve-mr-compar' into 'master' Douwe Maan
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
2016-10-12Update health_check gem to `~> 2.2.0`Robert Speicher
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22278
2016-10-12Bump gitlab_git to 10.6.8Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-12Use activerecord_sane_schema_dumperRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-11Merge branch 'master' into 'master' Rémy Coutable
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
2016-10-11Bump mail_room to v0.8.1 to fix thread cleanup issueStan Hu
Closes #20273
2016-10-07Make search results use the markdown cache columns, treating them consistentlyNick Thomas
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.
2016-10-06Update mail_room gemTjaart van der Walt
2016-10-06Merge commit 'dev/security' into 'master'Rémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-04Don't send Private-Token headers to SentryJacob Vosmaer
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22537
2016-10-04Update RuboCop to 0.43.0 and update configurationRobert Speicher
`Style/VariableNumber` is explicitly disabled because I don't think we care if we name a variable `var_1` or `var1`.
2016-10-04Upgrade acts-as-taggable-on from 3.5.0 to 4.0.0.Connor Shea
Changelog: https://github.com/mbleigh/acts-as-taggable-on/blob/master/CHANGELOG.md#400--2016-08-08
2016-10-01Replace talk_list patch with a patched forkJared Deckard
2016-09-29fix broken repo 500 errors in UI and added relevant specsJames Lopez
2016-09-29Merge branch 'cs-upgrade-devise' into 'master' Robert Speicher
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
2016-09-29Remove Flog as we use a Rubocop that does its job.Connor Shea
2016-09-28Bump ruby prof to 0.16Elan Ruusamäe
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>
2016-09-28Upgrade Devise from 4.1.1 to 4.2.0.Connor Shea
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
2016-09-27Merge branch 'zj-remove-deprecation-warnings-sprockets' into 'master' Rémy Coutable
Remove Sprockets deprecation warning See merge request !6535
2016-09-27Merge branch 'cs-upgrade-unicorn' into 'master' Robert Speicher
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
2016-09-27Remove Sprockets deprecation warningZ.J. van de Weg
2016-09-26update sprockets versionubudzisz
update sprockets version
2016-09-25Remove gitlab_meta gemRobert Speicher
2016-09-22Upgrade unicorn and unicorn-worker-killer.Connor Shea
Upgrade unicorn from 4.9.0 to 5.1.0 and unicorn-worker-killer from 0.4.2 to 0.4.4. Changelog for unicorn: http://unicorn.bogomips.org/NEWS.html Changelog for unicorn-worker-killer: https://github.com/kzk/unicorn-worker-killer/blob/bdec225f028d1bda01b5888578c479b0c705f1a8/ChangeLog
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 13:40:22 +0300