diff options
author | Rémy Coutable <remy@rymai.me> | 2016-08-11 11:23:53 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-08-11 11:23:53 +0000 |
commit | 624f35beedde6916dfd331718d0f2ecf6c4ca733 (patch) | |
tree | 2a152dc420fb0f72c7ee030ff65b9396b9994674 /Gemfile | |
parent | 3a46eac1ef903c027c244d31369329f45c636914 (diff) | |
parent | fb748daf538e43efcf8884f017391bcbfccf2ea2 (diff) | |
download | gitlab-ce-624f35beedde6916dfd331718d0f2ecf6c4ca733.tar.gz |
Merge branch '13333-consider-updating-http-parser-rb-to-0-6-0' into 'master'
Replace the tinder gem by bare HTTP requests
## What does this MR do?
It removes the `tinder` gem (used to talk to the Campfire API) and replaces its use by bare HTTP requests.
## Are there points in the code the reviewer needs to double check?
N/A.
## Why was this MR needed?
To simplify the potential dependency hell discussed in #13333.
The initial issue was about updating `http_parser.rb` which was required by `twitter-stream` which was required by `tinder`.
Those 3 gems are not needed anymore.
## What are the relevant issue numbers?
#13333
## Screenshots (if relevant)
N/A.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [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)
Closes #13333
See merge request !5758
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -163,9 +163,6 @@ gem 'redis-rails', '~> 4.0.0' gem 'redis', '~> 3.2' gem 'connection_pool', '~> 2.0' -# Campfire integration -gem 'tinder', '~> 1.10.0' - # HipChat integration gem 'hipchat', '~> 1.5.0' |