summaryrefslogtreecommitdiff
path: root/Gemfile.rails5.lock
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Use gitaly-proto 0.117.0Douglas Barbosa Alexandre2018-09-061-2/+2
|/
* Merge branch 'sh-fix-attachments-inline' into 'master'Nick Thomas2018-09-061-1/+1
|\ | | | | | | | | | | | | 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/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+2
|/ | | | Full list of changes: https://github.com/fnando/browser/blob/master/CHANGELOG.md
* Merge branch '50930-update-rubyzip-to-1-2-2' into 'master'Robert Speicher2018-09-041-1/+1
|\ | | | | | | | | | | | | Update rubyzip gem to 1.2.2 (CVE-2018-1000544) Closes #50930 See merge request gitlab-org/gitlab-ce!21460
| * Update rubyzip to 1.2.2 (CVE-2018-1000544)Takuya Noguchi2018-09-031-1/+1
| |
* | Merge branch 'junit-results' into 'master'Rémy Coutable2018-09-041-0/+3
|\ \ | | | | | | | | | | | | Enable JUnit results for rspec See merge request gitlab-org/gitlab-ce!21449
| * | Enable JUnit results for rspecKamil Trzciński2018-09-031-1/+4
| | |
* | | Stop using FlayRémy Coutable2018-09-031-7/+0
| |/ |/| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Upgrade LicenseFinder Gem to v5.4.0Winnie Hellmann2018-08-301-11/+8
| |
* | Allow whitelisting for "external collaborator by default" settingRoger Rüttimann2018-08-301-0/+4
| |
* | Rails5 update Gemfile.rails5.lockJasper Maes2018-08-261-10/+8
|/
* Bump fog-google to 1.7.1 and google-api-client to 0.23.0sh-bump-fog-googleStan Hu2018-08-211-6/+6
| | | | | | | This is needed to support query parameters in `Fog::Storage::Google`. See https://github.com/fog/fog-google/pull/409. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49957
* Remove Gemnasium serviceGilbert Roulot2018-08-201-3/+0
|
* Fix merge requests not showing any diff files for big patches49907-commits-and-merge-requests-does-not-list-all-files-when-one-file-exceeds-size-limitsAlejandro Rodríguez2018-08-171-3/+3
|
* Fix `bin/secpick` rainbow gem error, and security branch prefixingMichael Kozono2018-08-151-3/+2
|
* Backport some changes from gitlab-org/gitlab-ee!6767Rubén Dávila2018-08-071-2/+2
|
* Rails5: update Rails5 lock for forgotten gem rougeJasper Maes2018-08-031-1/+1
|
* Bump prometheus-client-mmap to 0.9.4Stan Hu2018-07-281-2/+2
| | | | | | | Fixes failing builds with gcc on Archlinux and Ruby 2.4.4. See https://gitlab.com/gitlab-org/prometheus-client-mmap/merge_requests/26 for more details.
* Rails5 update Gemfile.rails5.lockJasper Maes2018-07-261-6/+7
|
* Merge branch 'sh-include-rbtrace' into 'master'Douwe Maan2018-07-251-0/+6
|\ | | | | | | | | Add rbtrace to Gemfile See merge request gitlab-org/gitlab-ce!20831
| * Add rbtrace to Gemfilesh-include-rbtraceStan Hu2018-07-251-0/+6
| | | | | | | | | | | | | | This will be enabled if ENABLE_RBTRACE environment variable is defined. This will allow us to debug all sorts of issues in production: https://github.com/tmm1/rbtrace
* | Use limit parameter to retrieve Wikis from Gitalysh-use-wiki-limit-parameter-gitalyStan Hu2018-07-241-2/+2
|/ | | | | | | | Without this parameter, every load of a Wiki page will load all the Wiki pages in the repository for the sidebar. This is a significant performance penalty that can significant slow the display of all Wiki pages. Relates to #40101
* Bump nokogiri to 1.8.4 and sanitize to 4.6.6 for performancesh-bump-sanitize-4.6.6Stan Hu2018-07-231-1/+1
| | | | | | sanitize 4.6.6 has this optimization that will benefit Markdown rendering: https://github.com/rgrove/sanitize/pull/183 nokogiri 1.4.4 has this memory leak fix: https://github.com/sparklemotion/nokogiri/pull/1771
* Merge branch 'hangouts_chat_integration' into 'master'Sean McGivern2018-07-231-0/+2
|\ | | | | | | | | Hangouts chat integration See merge request gitlab-org/gitlab-ce!20290
| * Add Hangouts Chat service implementationKukovskii Vladimir2018-07-141-0/+2
| |
* | Add bootsnap to development/test bundle and enable it if availableGabriel Mazetto2018-07-201-0/+4
| | | | | | | | This will enable bootsnap whenver the gem is available.
* | Incorporate Gitaly's RefService.FindAllRemoteBranches RPCgitaly-remote-branchesAlejandro Rodríguez2018-07-181-2/+2
|/
* Merge branch 'update-rubocop'Sean McGivern2018-07-091-7/+7
|\
| * Use latest gitlab-stylesLin Jen-Shin2018-07-091-2/+2
| |
| * Use stable gitlab-styles and eliminate offensesLin Jen-Shin2018-07-091-11/+5
| |
| * Update rubocop to get rid of a warning in other MRLin Jen-Shin2018-07-091-8/+14
| |
* | Merge branch 'upgrade-hamlit-for-ruby25' into 'master'Rémy Coutable2018-07-091-4/+4
|\ \ | | | | | | | | | | | | | | | | | | Update hamlit to fix ruby 2.5 incompatibilities, fixes #42045 Closes #42045 See merge request gitlab-org/gitlab-ce!20315
| * | Update hamlit to fix ruby 2.5 incompatibilities, fixes #42045Matthew Dawson2018-07-081-4/+4
| |/ | | | | | | | | Also update the hook logs to escape the contents properly, as the :plain filter does not do html escaping.
* | Update Gemfile.rails5.lock with latest Gemfile.lock changesJasper Maes2018-07-071-5/+5
|/
* Add Repository#set_config and #delete_configJacob Vosmaer2018-07-061-2/+2
|
* Update OmniAuth Shibboleth gem to latest to gain supportTom Downes2018-07-041-2/+2
| | | | | | for handling multi-valued SAML assertions. Add documentation of label argument for omniauth provider to override text in login button.
* update html-pipeline 2.7.1 -> 2.8Pirate Praveen2018-06-301-2/+2
|
* Don't hash user ID in OIDC subject claimMarkus Koller2018-06-281-7/+3
|
* Gitaly metrics check for read/writeabilityZeger-Jan van de Weg2018-06-271-2/+2
| | | | | | | | | | | | | | Prior to this change, health checks checked for writeability of the NFS shards. Given we're moving away from that, this patch extends the checks for Gitaly to check for read and writeability. Potentially some dashboards will break, as over time these metrics will no longer appear as Prometheus doesn't get the data anymore. Observability in the circuit breaker will be reduced, but its not expected to be turned on and the circuit breaker is being removed soon too. Closes https://gitlab.com/gitlab-org/gitaly/issues/1218
* Merge branch 'security-fj-bumping-sanitize-gem' into 'master'Alessio Caiazza2018-06-251-4/+8
|\ | | | | | | | | [master] Update sanitize gem to 4.6.5 to fix HTML injection vulnerability See merge request gitlab/gitlabhq!2399
| * Merge branch 'master' into 'security-fj-bumping-sanitize-gem'Douwe Maan2018-06-181-1/+1
| |\ | | | | | | | | | # Conflicts: # Gemfile.rails5.lock
| * | Update Gemfile.rails5.lockDouwe Maan2018-06-181-4/+8
| | |
* | | Remove remaining traces of the Allocations Gemremove-allocations-gemYorick Peterse2018-06-201-2/+0
| | | | | | | | | | | | | | | | | | | | | In MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15834 we removed use of the data produced by the Allocations Gem. However, we never removed the code that just enables tracking of allocations. In this commit we remove all remaining traces of this Gem.
* | | Merge branch 'use-backup-custom-hooks-gitaly' into 'master'Douwe Maan2018-06-201-2/+2
|\ \ \ | |_|/ |/| | | | | | | | Use gitaly for backup rake task See merge request gitlab-org/gitlab-ce!19742