summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Bump nokogiri, loofah, and rack gems for security updatesStan Hu2018-11-191-1/+1
| | | | | | | | | | | | | | | loofah: CVE-2018-16468: https://github.com/flavorjones/loofah/issues/154 nokogiri: CVE-2018-14404 and CVE-2018-14567 https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md rack: CVE-2018-16471 https://github.com/rack/rack/commit/e5d58031b766e49687157b45edab1b8457d972bd i18n: https://github.com/svenfuchs/i18n/releases concurrent-ruby: https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md
* Merge branch ↵46166-add-constraints-that-prevent-ci_builds-from-being-associated-with-null-pipeline-projectSean McGivern2018-11-191-5/+8
|\ | | | | | | | | | | | | | | | | '54093-the-default_value_for-gem-doesn-t-handle-actioncontroller-parameters-correctly' into 'master' Replace the `default_value_for` gem with the `gitlab-default_value_with` gem which handles `ActionController::Parameters` correctly Closes #54093 See merge request gitlab-org/gitlab-ce!23114
| * Use gitlab-default_value_with Rails 5Rémy Coutable2018-11-151-5/+8
| | | | | | | | | | | | | | | | | | | | This forks live at https://github.com/gitlabhq/default_value_for/tree/69-fix-action_controller-parameters-handling and fixes an issue where default_value_for wouldn't handle `ActionController::Parameters` correctly with Rails 5. This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/54093. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '54004-update-asana-to-0.8.1' into 'master'Sean McGivern2018-11-191-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Update asana to 0.8.1 Closes #54004 See merge request gitlab-org/gitlab-ce!23039
| * | Update asana to 0.8.1Takuya Noguchi2018-11-191-1/+1
| | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | Merge branch 'sh-use-nakayoshi-fork' into 'master'Sean McGivern2018-11-191-0/+3
|\ \ \ | |/ / |/| | | | | | | | Improve memory performance by reducing dirty pages before fork See merge request gitlab-org/gitlab-ce!23169
| * | Improve memory performance by reducing dirty pages after fork()sh-use-nakayoshi-forkStan Hu2018-11-181-0/+3
| |/ | | | | | | | | | | | | | | The nakayoshi_fork gem works around the lack of a Ruby compacting garbage collecting by calling GC.start a few times to "promote" the age of young objects to the maximum age 3. This reduces the number of dirty pages and consequently improves copy-on-write behavior with unicorn and other forking Web application servers.
* | Merge branch '54010-update-asciidoctor-to-1.5.8' into 'master'Rémy Coutable2018-11-191-1/+1
|\ \ | |/ |/| | | | | | | | | Update asciidoctor to 1.5.8 Closes #54010 See merge request gitlab-org/gitlab-ce!23047
| * Update asciidoctor to 1.5.8Takuya Noguchi2018-11-151-1/+1
| | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Use the new parallel keyword in .gitlab-ci.ymluse-parallel-ci-keywordRémy Coutable2018-11-151-1/+1
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'switch-rails' into 'master'Sean McGivern2018-11-141-1/+1
|\ | | | | | | | | | | | | Switch to Rails 5 Closes #14286 and #48991 See merge request gitlab-org/gitlab-ce!21492
| * Switch to Rails 5 by defaultJan Provaznik2018-11-141-1/+1
| | | | | | | | | | * updates Gemfile * uses Rails 5 unless explicitly disabled
* | Bump `binding_of_caller` gem version to 0.8.0Shinya Maeda2018-11-141-1/+1
|/
* Merge branch '53289-update-haml_lint-to-0-28-0' into 'master'Rémy Coutable2018-11-131-1/+1
|\ | | | | | | | | | | | | 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-1/+1
| | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Merge branch '53291-update-ffaker-to-2-10-0' into 'master'Rémy Coutable2018-11-131-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 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-1/+1
| |/ | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | 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-1/+1
| | |
| * | Add Discord integrationblackst0ne2018-10-301-0/+3
| | |
* | | 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-1/+1
| | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/53082
* | | Merge branch 'fj-41213-api-update-submodule-commit' into 'master'Sean McGivern2018-11-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3/+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-3/+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-3/+0
| |/ |/| | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Add experimental support for Pumaan-multithreadingAndrew Newdigate2018-10-251-0/+5
|/ | | | | | 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.
* Bump google-protobuf to 3.6.1Stan Hu2018-10-241-2/+1
| | | | | | | | | 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-5/+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-4/+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-1/+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-1/+1
|\ \ | |/ |/| | | | | Use grpc v1.15.x See merge request gitlab-org/gitlab-ce!22350
| * Use grpc v1.15.xAlejandro Rodríguez2018-10-151-1/+1
| |
* | Remove dependencies on LinguistZeger-Jan van de Weg2018-10-121-3/+1
|/ | | | | | | | | | | | | | | | 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.
* Merge branch 'add_reliable_fetcher' into 'master'Nick Thomas2018-10-041-0/+1
|\ | | | | | | | | Add reliable sidekiq fetcher See merge request gitlab-org/gitlab-ce!21715
| * Add reliable fetcher for Sidekiqadd_reliable_fetcherValery Sizov2018-10-031-0/+1
| |
* | Remove Gitlab::Git::Repository#rugged and Gollum codeAlejandro Rodríguez2018-10-021-3/+2
| | | | | | | | | | | | | | | | 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 '37433-solve-n-1-in-refs-controller-logs-tree' into 'master'Nick Thomas2018-10-011-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Implements list_last_commits_for_tree to communicate with the ListLastCommitsForTree Gitaly RPC Bumps the Gitaly server version Bumps the Gitaly-Proto gem version
* | | Merge branch 'master' into 'remove-dropzonejs-rails'Mike Greiling2018-09-281-82/+98
|\ \ \ | |/ / | | | | | | # Conflicts: # Gemfile.lock
| * | Merge branch '51299-update-grape' into 'master'Sean McGivern2018-09-261-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+0
| | | | | | | | | | | | We remove this feature as it never worked properly
| * | Remove peek-sidekiqJan Provaznik2018-09-121-1/+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-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Use gitaly-proto 0.117.0Douglas Barbosa Alexandre2018-09-061-1/+1
| |
| * Merge branch 'sh-fix-attachments-inline' into 'master'Nick Thomas2018-09-061-1/+3
| |\ | | | | | | | | | | | | | | | | | | Fix attachments not displaying inline with Google Cloud Storage Closes #49957 See merge request gitlab-org/gitlab-ce!21265
| | * Fix attachments not displaying inline with Google Cloud StorageStan Hu2018-09-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were several issues: 1. With Google Cloud Storage, we can't override the Content-Type with Response-Content-Type once it is set. Setting the value to `application/octet-stream` doesn't buy us anything. GCS defaults to `application/octet-stream`, and AWS uses `binary/octet-stream`. Just remove this `Content-Type` when we upload new files. 2. CarrierWave and fog-google need to support query parameters: https://github.com/fog/fog-google/pull/409/files, https://github.com/carrierwaveuploader/carrierwave/pull/2332/files. CarrierWave has been monkey-patched until an official release. 3. Workhorse also needs to remove the Content-Type header in the request (https://gitlab.com/gitlab-org/gitlab-workhorse/blob/ef80978ff89e628c8eeb66556720e30587d3deb6/internal/objectstore/object.go#L66), or we'll get a 403 error when uploading due to signed URLs not matching the headers. Upgrading to Workhorse 6.1.0 for https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/297 will make Workhorse use the headers that are used by Rails. Closes #49957
| * | Bump browser gem to v2.5.3Stan Hu2018-09-051-1/+1
| |/ | | | | | | Full list of changes: https://github.com/fnando/browser/blob/master/CHANGELOG.md
| * Merge branch 'junit-results' into 'master'Rémy Coutable2018-09-041-0/+1
| |\ | | | | | | | | | | | | Enable JUnit results for rspec See merge request gitlab-org/gitlab-ce!21449
View Lorry Controller Status