summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Update vmstat to version 2.3.0mrchrisw-update-vmstatChris Wilson2016-12-271-1/+1
| | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/26114 vmstat 2.3.0 fixes an issue with reporting the incorrect # of CPUs. This is used in the GitLab Admin Dashboard.
* Merge branch 'authentiq-id-oauth-support' into 'master' Rémy Coutable2016-12-211-0/+1
|\ | | | | | | | | Added support for Authentiq OAuth provider See merge request !8038
| * Added support for Authentiq oauth providerAlex2016-12-211-0/+1
| |
* | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-201-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slack slash commands ## What does this MR do? Implement Slack Slash Commands by utilizing generalized Mattermost presenter to fulfill Slack requirements. ## Why was this MR needed? We want to expose Slack Slash Commands as a first-class service. ## What are the relevant issue numbers? Supersedes !8007 Closes #22182 See merge request !8126
| * Create Slack Slash command serviceZ.J. van de Weg2016-12-161-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-161-1/+4
|\ \ | |/
| * Merge branch 'gem-update-grape' into 'master' Rémy Coutable2016-12-161-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update grape to 0.18.0 ## What does this MR do? Update grape to 0.18.0. Required for the settings API. ## What are the relevant issue numbers? #22928 See merge request !8057
| | * Update grape to 0.18.0gem-update-grapeRobert Schilling2016-12-141-1/+1
| | |
| * | Introduce deployment services, starting with a KubernetesServiceNick Thomas2016-12-141-0/+3
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-141-4/+4
|\ \ | |/
| * Update Sidekiq from 4.2.1 to 4.2.7.cs-update-sidekiq-427Connor Shea2016-12-111-1/+1
| | | | | | | | | | | | Includes various bug fixes, mostly for Rails 5. Changelog: https://github.com/mperham/sidekiq/blob/fc168fe393bee3ad1fcbb52cff2d84af86c38cc4/Changes.md
| * Update factory_girl_rails to 4.7.0rs-update-factory_girl_railsRobert Speicher2016-12-081-1/+1
| |
| * Merge branch 'pry-byebug' into 'master' Rémy Coutable2016-12-051-1/+1
| |\ | | | | | | | | | | | | Use pry-byebug instead byebug See merge request !7925
| | * Use pry-byebug instead byebugSemyon Pupkov2016-12-051-1/+1
| | | | | | | | | | | | https://github.com/deivid-rodriguez/pry-byebug
| * | Update paranoia from 2.1.4 to 2.2.0.cs-upgrade-paranoiaConnor Shea2016-12-041-1/+1
| |/ | | | | | | | | | | Includes support for Rails 5. Changelog: https://github.com/rubysherpas/paranoia/blob/879fd18caa46af70fceca2e8f46886b3eff072ec/CHANGELOG.md#220-2016-10-21
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-11-301-4/+4
|\ \ | |/
| * Merge branch 'add-stackprof' into 'master' Robert Speicher2016-11-301-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 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 specNick Thomas2016-11-291-0/+2
| | |
| * | Update Sidekiq-cron to fix compatibility issues with Sidekiq 4.2.1sh-update-sidekiq-cronStan Hu2016-11-291-1/+1
| |/ | | | | | | | | | | | | 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' 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>
* | Remove omniauth-bitbucket gemDouglas Barbosa Alexandre2016-11-211-1/+0
|/
* 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
| |