summaryrefslogtreecommitdiff
path: root/Gemfile.lock
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'switch-rails' into 'master'Sean McGivern2018-11-141-64/+73
|\
| * Minor gem fixesswitch-railsJan Provaznik2018-11-141-1/+1
| * Switch to Rails 5 by defaultJan Provaznik2018-11-141-65/+74
* | Bump `binding_of_caller` gem version to 0.8.0Shinya Maeda2018-11-141-3/+3
|/
* Merge branch '53289-update-haml_lint-to-0-28-0' into 'master'Rémy Coutable2018-11-131-3/+3
|\
| * Update haml_lint to 0.28.0Takuya Noguchi2018-10-291-3/+3
* | Merge branch '53291-update-ffaker-to-2-10-0' into 'master'Rémy Coutable2018-11-131-2/+2
|\ \
| * | Update ffaker to 2.10.0Takuya Noguchi2018-10-291-2/+2
| |/
* | Merge branch 'sh-bump-redis-store' into 'master'Rémy Coutable2018-11-121-1/+1
|\ \
| * | Bump redis-store to 1.6.0sh-bump-redis-storeStan Hu2018-11-101-1/+1
* | | Merge branch 'sh-bump-mime-types' into 'master'Rémy Coutable2018-11-121-2/+2
|\ \ \
| * | | Bump mime-types to 3.2.2Stan Hu2018-11-091-2/+2
| |/ /
* | | Merge branch 'sh-bump-sidekiq' into 'master'Sean McGivern2018-11-121-3/+3
|\ \ \
| * | | Bump Sidekiq and other related gemsStan Hu2018-11-091-3/+3
| |/ /
* | | Merge branch 'blackst0ne-add-discord-service' into 'master'Sean McGivern2018-11-121-0/+3
|\ \ \
| * | | Update Gemfileblackst0ne2018-11-051-8/+3
| * | | Add Discord integrationblackst0ne2018-10-301-0/+8
* | | | Update gitlab-markup gem to avoid binary name collision53082-gitlab-ce-11-4-0-gemfile-conflict-gitlab-markup-and-github-markupAlejandro Rodríguez2018-11-111-2/+2
| |/ / |/| |
* | | Merge branch 'fj-41213-api-update-submodule-commit' into 'master'Sean McGivern2018-11-071-5/+4
|\ \ \
| * | | Add submodule update API endpointFrancisco Javier López2018-11-071-5/+4
| |/ /
* | | Merge branch 'remove-asset-sync' into 'master'Marin Jankovski2018-11-071-6/+0
|\ \ \ | |/ / |/| |
| * | Remove asset_sync gem and related coderemove-asset-syncBalasankar "Balu" C2018-10-251-6/+0
* | | Merge branch '53270-remove-mousetrap-rails' into 'master'Mike Greiling2018-10-291-2/+0
|\ \ \
| * | | Remove mousetrap-rails gemTakuya Noguchi2018-10-281-2/+0
| | |/ | |/|
* | | Upgrade whitequark/parser to 2.5.3.0sh-bump-whitequark-parserStan Hu2018-10-281-1/+1
|/ /
* | Merge branch 'an-multithreading' into 'master'Robert Speicher2018-10-251-0/+6
|\ \
| * | Add experimental support for Pumaan-multithreadingAndrew Newdigate2018-10-251-0/+6
| |/
* | Upgrade parser gem to 2.5.1.2sh-update-parserStan Hu2018-10-241-1/+1
|/
* Bump google-protobuf to 3.6.1Stan Hu2018-10-241-2/+2
* Merge branch '44361-remove-gitlab-grit' into 'master'Rémy Coutable2018-10-171-23/+1
|\
| * Remove a dependency on gitlab-gollum-libNick Thomas2018-10-161-18/+0
| * Inline the gitlab-flowdock-git-hooks gemNick Thomas2018-10-161-5/+1
* | Merge branch 'grpc-update-1-15' into 'master'Rémy Coutable2018-10-161-13/+7
|\ \ | |/ |/|
| * Use grpc v1.15.xAlejandro Rodríguez2018-10-151-14/+8
* | Remove dependencies on LinguistZeger-Jan van de Weg2018-10-121-7/+2
|/
* Bump rugged to 0.27.5 for security fixesStan Hu2018-10-081-1/+1
* Merge branch 'add_reliable_fetcher' into 'master'Nick Thomas2018-10-041-0/+3
|\
| * Add reliable fetcher for Sidekiqadd_reliable_fetcherValery Sizov2018-10-031-0/+3
* | Merge branch 'update-dev-test-gems' into 'master'Robert Speicher2018-10-031-10/+10
|\ \
| * | Update Development related gemsGabriel Mazetto2018-10-031-10/+10
* | | Merge branch 'remove-rugged' into 'master'Douwe Maan2018-10-031-4/+1
|\ \ \ | |/ / |/| |
| * | Remove Gitlab::Git::Repository#rugged and Gollum codeAlejandro Rodríguez2018-10-021-4/+1
* | | Merge branch 'rouge-3.3.0' into 'master'Stan Hu2018-10-021-1/+1
|\ \ \ | |/ / |/| |
| * | Update to Rouge 3.3.0 including frozen string literals for improved memory usageDrew Blessing2018-10-011-1/+1
* | | Merge branch '37433-solve-n-1-in-refs-controller-logs-tree' into 'master'Nick Thomas2018-10-011-2/+2
|\ \ \
| * | | Removes N+1 gitaly rpc call to fetch the last commit for pathTiago Botelho2018-10-011-2/+2
| |/ /
* | | Update Gemfile.lockMike Greiling2018-09-281-1/+0
* | | Merge branch 'master' into 'remove-dropzonejs-rails'Mike Greiling2018-09-281-283/+259
|\ \ \ | |/ /
| * | Merge branch '51299-update-grape' into 'master'Sean McGivern2018-09-261-3/+3
| |\ \ | | |/ | |/|
| | * Update grape to 1.1.0 to address a XSS vulnerability51299-update-grapeRémy Coutable2018-09-101-3/+3