summaryrefslogtreecommitdiff
path: root/Gemfile.rails5.lock
Commit message (Collapse)AuthorAgeFilesLines
* Switch to Rails 5 by defaultJan Provaznik2018-11-141-1166/+0
| | | | | * updates Gemfile * uses Rails 5 unless explicitly disabled
* 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.0 Closes #53289 See merge request gitlab-org/gitlab-ce!22660
| * Update haml_lint to 0.28.0Takuya Noguchi2018-10-291-3/+3
| | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Merge branch '53291-update-ffaker-to-2-10-0' into 'master'Rémy Coutable2018-11-131-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Update ffaker to 2.10.0 Closes #53291 See merge request gitlab-org/gitlab-ce!22661
| * | Update ffaker to 2.10.0Takuya Noguchi2018-10-291-2/+2
| |/ | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Merge branch 'sh-bump-redis-store' into 'master'Rémy Coutable2018-11-121-1/+1
|\ \ | | | | | | | | | | | | Bump redis-store to 1.6.0 See merge request gitlab-org/gitlab-ce!22963
| * | Bump redis-store to 1.6.0sh-bump-redis-storeStan Hu2018-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | This version supports SSL/TLS via the redis:// URL scheme: https://github.com/redis-store/redis-store/blob/master/CHANGELOG.md Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/47702
* | | Merge branch 'rails5-update-gemfile' into 'master'Sean McGivern2018-11-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Upgrade whitequark/parser to 2.5.3.0 See merge request gitlab-org/gitlab-ce!22984
| * | | Upgrade whitequark/parser to 2.5.3.0Jan Provaznik2018-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | Rails 5 counterpart to the version update from 7fb30b4cc4994022e55460e6905996212859cfb6
* | | | Merge branch 'sh-bump-sidekiq' into 'master'Sean McGivern2018-11-121-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Bump Sidekiq and other related gems See merge request gitlab-org/gitlab-ce!22956
| * | | Update gems in Gemfile.rails5.lockJan Provaznik2018-11-121-2/+2
| |/ /
* | | Merge branch 'blackst0ne-add-discord-service' into 'master'Sean McGivern2018-11-121-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add Discord integration Closes #21635 See merge request gitlab-org/gitlab-ce!22684
| * | | 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
| |/ / |/| | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/53082
* | | Merge branch 'fj-41213-api-update-submodule-commit' into 'master'Sean McGivern2018-11-071-5/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add endpoint to update a git submodule reference Closes #41213 See merge request gitlab-org/gitlab-ce!20949
| * | | Add submodule update API endpointFrancisco Javier López2018-11-071-5/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | This new endpoint allow users to update a submodule's reference. The MR involves adding a new operation RPC operation in gitaly-proto (see gitlab-org/gitaly-proto!233) and change Gitaly to use this new version (see gitlab-org/gitaly!936). See gitlab-org/gitlab-ce!20949
* | | Merge branch 'remove-asset-sync' into 'master'Marin Jankovski2018-11-071-6/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Remove asset_sync gem and related code Closes omnibus-gitlab#3872 See merge request gitlab-org/gitlab-ce!22610
| * | Remove asset_sync gem and related coderemove-asset-syncBalasankar "Balu" C2018-10-251-6/+0
| | | | | | | | | | | | | | | Reverting https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15734 . We are not using asset sync currently.
* | | Remove mousetrap-rails gemTakuya Noguchi2018-10-281-2/+0
| |/ |/| | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Merge branch 'an-multithreading' into 'master'Robert Speicher2018-10-251-0/+6
|\ \ | | | | | | | | | | | | | | | | | | Puma in GDK and rack server lifecycle event abstractions Closes #52762 See merge request gitlab-org/gitlab-ce!22372
| * | Add experimental support for Pumaan-multithreadingAndrew Newdigate2018-10-251-0/+6
| |/ | | | | | | | | | | This allows us (and others) to test drive Puma without it affecting all users. Puma can be enabled by setting the environment variable "EXPERIMENTAL_PUMA" to a non empty value.
* | 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
| | | | | | | | | It looks like gRPC may have worked around https://github.com/google/protobuf/issues/4210 via https://github.com/grpc/grpc/pull/14634. This is needed to support Ruby 2.5 (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22555).
* Merge branch '44361-remove-gitlab-grit' into 'master'Rémy Coutable2018-10-171-23/+1
|\ | | | | | | | | | | | | Remove gitlab-grit as a transitive dependency of GitLab Closes #44361 See merge request gitlab-org/gitlab-ce!22373
| * Remove a dependency on gitlab-gollum-libNick Thomas2018-10-161-18/+0
| | | | | | | | | | | | | | | | Removing this dependency also allows us to remove a transitive dependency on gitlab_grit - which is the whole point of this exercise. I don't think we can EOL gitlab_grit until it's removed as a dependency from gitaly-ruby, but this at least gets it out of gitlab-ce.
| * Inline the gitlab-flowdock-git-hooks gemNick Thomas2018-10-161-5/+1
| | | | | | | | | | This allows us to avoid one transitive dependency on gitlab-grit. The aim is to remove all transitive dependencies.
* | Merge branch 'grpc-update-1-15' into 'master'Rémy Coutable2018-10-161-13/+7
|\ \ | |/ |/| | | | | Use grpc v1.15.x See merge request gitlab-org/gitlab-ce!22350
| * Use grpc v1.15.xAlejandro Rodríguez2018-10-151-14/+8
| |
* | Remove dependencies on LinguistZeger-Jan van de Weg2018-10-121-7/+2
|/ | | | | | | | | | | | | | | | This saves about 128 MB of baseline RAM usage per Unicorn and Sidekiq process (!). Linguist wasn't detecting languages anymore from CE/EE since 9ae8b57467ac8b38f1fa9020a466d94a93cbb9dd. However, Linguist::BlobHelper was still being depended on by BlobLike and others. This removes the Linguist gem, given it isn't required anymore. EscapeUtils were pulled in as dependency, but given Banzai depends on it, it is now added explicitly. Previously, Linguist was used to detect the best ACE mode. Instead, we rely on ACE to guess the best mode based on the file extension.
* Bump rugged to 0.27.5 for security fixesStan Hu2018-10-081-1/+1
| | | | See: https://github.com/libgit2/libgit2/releases
* Merge branch 'add_reliable_fetcher' into 'master'Nick Thomas2018-10-041-0/+3
|\ | | | | | | | | Add reliable sidekiq fetcher See merge request gitlab-org/gitlab-ce!21715
| * Add reliable fetcher for Sidekiqadd_reliable_fetcherValery Sizov2018-10-031-0/+3
| |
* | Merge branch 'update-dev-test-gems' into 'master'Robert Speicher2018-10-031-11/+11
|\ \ | | | | | | | | | | | | Update Development related gems See merge request gitlab-org/gitlab-ce!22066
| * | Update Development related gemsGabriel Mazetto2018-10-031-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to latest version the following gems: * Spring * Bootsnap * Thin * webpack-rails * pry-rails
* | | Merge branch 'remove-rugged' into 'master'Douwe Maan2018-10-031-4/+1
|\ \ \ | |/ / |/| | | | | | | | Remove Gitlab::Git::Repository#rugged See merge request gitlab-org/gitlab-ce!22039
| * | Remove Gitlab::Git::Repository#rugged and Gollum codeAlejandro Rodríguez2018-10-021-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Cleanup code, and refactor tests that still use Rugged. After this, there should be no Rugged code that access the instance's repositories on non-test environments. There is still some rugged code for other tasks like the repository import task, but since it doesn't access any repository storage path it can stay.
* | | 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 usage See merge request gitlab-org/gitlab-ce!22035
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adds list_last_commits_for_tree as the method call for the Gitaly ListLastCommitsForTree RPC Closes #37433 See merge request gitlab-org/gitlab-ce!21921
| * | | Removes N+1 gitaly rpc call to fetch the last commit for pathTiago Botelho2018-10-011-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Implements list_last_commits_for_tree to communicate with the ListLastCommitsForTree Gitaly RPC Bumps the Gitaly server version Bumps the Gitaly-Proto gem version
* | | Update rails 5 Gemfile.lockMike Greiling2018-09-281-3/+0
|/ /
* | Merge branch '51299-update-grape' into 'master'Sean McGivern2018-09-261-3/+3
|\ \ | |/ |/| | | | | | | | | Update grape to 1.1.0 to address a XSS vulnerability Closes #51299 See merge request gitlab-org/gitlab-ce!21639
| * Update grape to 1.1.0 to address a XSS vulnerability51299-update-grapeRémy Coutable2018-09-101-3/+3
| | | | | | | | | | | | | | | | | | See https://github.com/ruby-grape/grape/blob/master/CHANGELOG.md#110-842018. This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/51299. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Remove background job throttling feature51509-remove-sidekiq-limit-fetchValery Sizov2018-09-241-3/+0
| | | | | | | | We remove this feature as it never worked properly
* | Sync commonmaker version in Gemfile.*.lockJan Provaznik2018-09-171-1/+1
| | | | | | | | commonmaker was update in Gemfile.lock only
* | Remove peek-sidekiqJan Provaznik2018-09-121-5/+0
| | | | | | | | | | | | | | | | | | | | The reason for removing this gem is that it's not being maintained anymore. It uses `alias_method_chain` which is deprecated in rails 5 (and removed in 5.1), the issue is pending upstream (including a fix) - https://github.com/suranyami/peek-sidekiq/issues/3 for a while. Peek-sidekiq is used in performance bar for displaying sidekiq statistics.
* | Bump Sidekiq 5.1.3 to 5.2.1Stan Hu2018-09-091-6/+5
|/ | | | | | | | | | | | | The most significant change in this version is that the default concurrency has been lowered from 25 to 10 (https://github.com/mperham/sidekiq/issues/3892). This doesn't affect omnibus-gitlab because the concurrency is controlled via a setting that defaults to 25 anyway and is passed in via the `-c` command-line parameter. However, source installations (including the GDK) will have to either specify the concurrency in `sidekiq.yml` or use the `-c` option. Full list of changes: https://github.com/mperham/sidekiq/blob/master/Changes.md
* Merge branch '51180-update-ffi-to-1.9.25' into 'master'Robert Speicher2018-09-071-1/+1
|\ | | | | | | | | | | | | Update ffi to 1.9.25 Closes #51180 See merge request gitlab-org/gitlab-ce!21561
| * Update ffi to 1.9.25Takuya Noguchi2018-09-061-1/+1
| |
View Lorry Controller Status