summaryrefslogtreecommitdiff
path: root/Gemfile.rails5.lock
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | Migrate repo backup to gitalyAhmad Hassan2018-06-151-2/+2
| |/
* | Rails5 update Gemfile.rails5.lockJasper Maes2018-06-161-2/+2
|/
* [Rails5] Update Gitlab.rails5.lockblackst0ne-update-gemfile-rails5-lockblackst0ne2018-06-121-19/+19
|
* Bump grape-path-helpers to 1.0.5blackst0ne2018-06-081-5/+7
|
* Use same gem versions for rails5 as for rails4 where possibleJasper Maes2018-06-071-113/+123
|
* update net-ssh 4 -> 5, remove rbnacl, rbnacl-libsodium (not needed)Pirate Praveen2018-06-061-8/+4
|
* [Rails5] Update Gemfile.rails5.lockblackst0ne-update-gemfile-rails5blackst0ne2018-06-051-36/+35
|
* Update Gemfile.rails5.lockblackst0ne-remove-spinachblackst0ne2018-05-141-17/+0
|
* [Rails5] Bump Rails to 5.0.7 and set `atomic` to 1.1.99blackst0ne-rails5-bump-rails5-to-5-0-7blackst0ne2018-05-111-62/+58
| | | | atomic 1.1.100 was yanked by its author.
* [Rails5] Fix params passed to MergeWorkerblackst0ne2018-05-031-6/+4
|
* Update `Gemfile.rails5.lock`blackst0ne2018-04-281-4/+1
|
* [Rails5] Fix `params` for DeleteUserWorkerblackst0ne2018-04-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This commit fixes the error: ``` 1) Admin::UsersController DELETE #user with projects deletes the user and their contributions when hard delete is specified Failure/Error: Users::DestroyService.new(current_user).execute(delete_user, options.symbolize_keys) NoMethodError: undefined method `symbolize_keys' for "{\"hard_delete\"=>\"true\"}":String # ./app/workers/delete_user_worker.rb:8:in `perform' # ./lib/gitlab/sidekiq_status/server_middleware.rb:5:in `call' # ./config/initializers/forbid_sidekiq_in_transactions.rb:35:in `block (2 levels) in <module:NoEnqueueingFromTransactions>' # ./app/models/user.rb:913:in `delete_async' # ./app/controllers/admin/users_controller.rb:148:in `destroy' # ./lib/gitlab/i18n.rb:50:in `with_locale' # ./lib/gitlab/i18n.rb:56:in `with_user_locale' # ./app/controllers/application_controller.rb:327:in `set_locale' # ./spec/controllers/admin/users_controller_spec.rb:28:in `block (3 levels) in <top (required)>' Finished in 6.81 seconds (files took 13.9 seconds to load) 1 example, 1 failure ```
* [Rails5] Avoid type casting in uniqueness validatorblackst0ne2018-04-191-22/+18
| | | | | | | | | | | | | | | | | | | | | | This commit does two things: 1. Synchronizes `Gemfile.rails5.lock` with the latest changes in `Gemfile` 2. Adds a monkey patch for active record to avoid type casting in uniqueness validator. In Rails 5.0 there was introduced a bug [1] that causes to problems like this: ``` 1) API::Users POST /user/:id/gpg_keys/:key_id/revoke when authenticated revokes existing key Failure/Error: let(:gpg_key) { create(:gpg_key, user: user) } TypeError: can't cast Hash ``` This bug was fixed in Rails 5.1 [2]. [1]: https://github.com/rails/rails/pull/23523/commits/811a4fa8eb6ceea841e61e8ac05747ffb69595ae [2]: https://github.com/rails/rails/pull/24745/commits/aa062318c451512035c10898a1af95943b1a3803
* [Rails5] Fix running spinach testsblackst0ne2018-04-101-1/+5
| | | | | | | | | | | | | | 1. Add support for `RAILS5=1|true` for the `bin/spinach` command. 2. Synchronize used spinach versions both for rails4 and rails5. For rails5 it was accidently used spinach 0.10.1 instead of 0.8.10. That brought some problems on running spinach tests. Example of failure message: NoMethodError: undefined method `line' for #<Spinach::Scenario:0x000000000c86ba80> Did you mean? lines /builds/gitlab-org/gitlab-ce/features/support/env.rb:52:in `before_scenario_run'
* [Rails5] Add `rails-controller-testing` gemblackst0ne-rails5-add-rails-controller-testing-gemblackst0ne2018-04-081-0/+5
| | | | | | | | In Rails 5.0 `assert_template` and `assigns()` have been extracted to the `rails-controller-testing` gem. https://github.com/rails/rails/pull/20138/files This commit adds this gem for rails5.
* Bump `parser` gem to 2.5.0.5blackst0ne-bump-parser-2-5-0-5blackst0ne2018-04-071-3/+3
| | | | | | | | 1. Synchronize used version of `parser` gem for both versions of rails: 4 and 5. 2. Fix broken CI pipelines for rails5 branches. The 2.5.0.4 version is removed from rubygems, so it's skipped. https://github.com/whitequark/parser/issues/478