summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'zj-upgrade-grape' into 'master' Robert Speicher2016-11-251-1/+1
|\ | | | | | | | | Update grape-entity to 0.6.0 See merge request !7491
| * Upgrade grape-entity to 0.6.0Z.J. van de Weg2016-11-231-1/+1
| |
| * Upgrade grape-entityZ.J. van de Weg2016-11-211-1/+1
| | | | | | | | Fixes gitlab-org/gitlab-ce#14329
* | Stop supporting Google and Azure as backup strategiesremove-backup-strategiesRémy Coutable2016-11-241-2/+0
|/ | | | | | | | | 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>
* Merge branch 'bugfix/html-only-mail' into 'master' Douwe Maan2016-11-181-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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 emailhttp://jneen.net/2016-11-171-0/+1
| |
* | Remove unused nested_form gemrs-remove-ci-gemsRobert Speicher2016-11-171-3/+0
| |
* | Remove activerecord-session_store gemRobert Speicher2016-11-171-1/+0
|/ | | | | We use the Redis-backed session store from `redis-store` so this is unnecessary.
* Allow certain Sidekiq jobs to be throttledPatricio Cano2016-11-101-0/+1
|
* Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2sh-bump-omniauth-gitlabStan Hu2016-11-071-1/+1
| | | | Closes gitlab-com/support-forum#1270
* Upgrade redis-rails from 4.0.0 to 5.0.1.cs-upgrade-redis-actionpackConnor Shea2016-11-041-1/+1
| | | | This update adds support for Rails 5. Also update redis-rails dependencies.
* Merge branch 'update-task-list' into 'master' Rémy Coutable2016-11-041-1/+1
|\ | | | | | | | | Updates deckar01-task_list gem to its latest version See merge request !7185
| * Update deckar01-task_list gem to 1.0.6Manuel Rüger2016-10-311-1/+1
| | | | | | | | ChangeLog: https://github.com/deckar01/task_list/compare/1.0.5...1.0.6
* | Update rdoc to `~> 4.2`rs-update-rdocRobert Speicher2016-11-031-1/+1
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2814
* | Remove unused `gitlab:generate_docs` Rake taskrs-remove-sdocRobert Speicher2016-11-031-3/+0
| | | | | | | | | | This was the only thing using the `sdoc` gem, which was blocking another gem from updating.
* | Merge branch 'update-diffy' into 'master' Rémy Coutable2016-11-021-1/+1
|\ \ | | | | | | | | | | | | Update diffy gem to 3.1.0 See merge request !7184
| * | Update diffy gem to 3.1.0Manuel Rüger2016-10-311-1/+1
| |/ | | | | | | ChangeLog: https://github.com/samg/diffy/blob/master/CHANGELOG
* | Merge branch 'update-rack-attack' into 'master' Rémy Coutable2016-11-021-1/+1
|\ \ | | | | | | | | | | | | Updates rack-attack gem to 4.4.1 See merge request !7186
| * | Update rack-attack gem to 4.4.1Manuel Rüger2016-10-311-1/+1
| |/ | | | | | | See: https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md
* | Fix lightweight tags not processed correctly by GitTagPushService22271-drone-tag-pipeline-buildAlejandro Rodríguez2016-10-281-1/+1
|/ | | | | | | | 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`.
* Merge branch 'issue_1008_1' into 'master' Sean McGivern2016-10-281-0/+3
|\ | | | | | | | | | | | | | | | | 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
| * Upgrade jira-ruby gem versionissue_1008_1Felipe Artur2016-10-261-1/+1
| |
| * Finish updates to use JIRA gemFelipe Artur2016-10-261-1/+1
| | | | | | | | Code improvements, bug fixes, finish documentation and specs
| * Refactor JIRA service to use gemDrew Blessing2016-10-261-0/+3
| |
* | Updated mail_room and added sentinel support to Reply by Email21645-mail_room_sentinelGabriel Mazetto2016-10-261-1/+1
|/
* Bump `omniauth-saml` to 1.7.0 to include security fixes and metadata support ↵update-omniauth-samlPatricio Cano2016-10-191-1/+1
| | | | for IdP auto-configuration.
* Enable activerecord_sane_schema_dumper for testKamil Trzcinski2016-10-171-2/+2
|
* Merge branch 'rs-loosen-request_store' into 'master' Dmitriy Zaporozhets2016-10-131-1/+1
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Loosen requirement on request_store versionRobert Speicher2016-10-131-1/+1
| | | | | | | | | | | | | | | | 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
* | Updated gitlab-markup forked gem to download from rubygemsbug/rst-forked-gemGabriel Mazetto2016-10-131-1/+1
| |
* | Use forked github-markup gem to enable python3 support with omnibusGabriel Mazetto2016-10-131-1/+1
|/
* Merge branch 'dz-improve-mr-compar' into 'master' Douwe Maan2016-10-121-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Bump gitlab_git to 10.6.8Dmitriy Zaporozhets2016-10-121-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Update health_check gem to `~> 2.2.0`Robert Speicher2016-10-121-1/+1
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22278
* | Use activerecord_sane_schema_dumperRémy Coutable2016-10-121-0/+2
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'master' into 'master' Rémy Coutable2016-10-111-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update mail_room gemTjaart van der Walt2016-10-061-1/+1
| |
* | Make search results use the markdown cache columns, treating them consistentlyNick Thomas2016-10-071-0/+1
|/ | | | | | 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.
* Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-061-1/+1
|\ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Don't send Private-Token headers to SentryJacob Vosmaer2016-10-041-1/+1
| | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22537
* | Update RuboCop to 0.43.0 and update configurationrs-update-rubocopRobert Speicher2016-10-041-1/+1
| | | | | | | | | | `Style/VariableNumber` is explicitly disabled because I don't think we care if we name a variable `var_1` or `var1`.
* | Upgrade acts-as-taggable-on from 3.5.0 to 4.0.0.cs-upgrade-acts-as-taggable-onConnor Shea2016-10-031-1/+1
| | | | | | | | Changelog: https://github.com/mbleigh/acts-as-taggable-on/blob/master/CHANGELOG.md#400--2016-08-08
* | Align gem version stringsJared Deckard2016-09-301-10/+10
| |
* | Replace talk_list patch with a patched forkJared Deckard2016-09-301-1/+1
| |
* | fix broken repo 500 errors in UI and added relevant specsJames Lopez2016-09-291-1/+1
| |
* | Merge branch 'cs-upgrade-devise' into 'master' Robert Speicher2016-09-291-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Upgrade Devise from 4.1.1 to 4.2.0.Connor Shea2016-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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 Flog as we use a Rubocop that does its job.cs-remove-flog-flayConnor Shea2016-09-281-1/+0
| | |
* | | Bump ruby prof to 0.16Elan Ruusamäe2016-09-281-1/+1
|/ / | | | | | | | | | | | | 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>
* | Merge branch 'zj-remove-deprecation-warnings-sprockets' into 'master' Rémy Coutable2016-09-271-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Remove Sprockets deprecation warning See merge request !6535
View Lorry Controller Status