Commit Graph

24 Commits

Author SHA1 Message Date
Abulhair Saparov 60c595c9e1 Bump gpgme gem version from 2.0.13 to 2.0.18 2018-12-03 05:59:52 +00:00
Matthias Fechner 3cf07b6e02 Manually edited the Gemfile.lock to make the gitlab-ce pipeline happy. 2018-11-30 07:21:01 +01:00
Rémy Coutable 7c0718cd79 Merge branch '51083-fix-move-api' into 'master'
Commits API: Preserve file content in move operations if unspecified

Closes #52974 et #51083

See merge request gitlab-org/gitlab-ce!23387
2018-11-29 11:36:16 +00:00
Kamil Trzciński dc962788fa Add monkey patch to unicorn to fix eof? problem
Rack with Unicorn is unable to handle chunked requests due to private `eof?` method.
This exposes `eof?` not changing `rack` behavior.

Issue: https://gitlab.com/gitlab-org/gitlab-ee/issues/8539
2018-11-28 08:34:32 -08:00
Nick Thomas 14076062df
Commits API: Preserve file content in move operations if unspecified 2018-11-28 11:50:05 +00:00
Kamil Trzciński 921d6b1a13 Merge branch 'upgrade_kubeclient_400' into 'master'
Upgrade kubeclient to 4.0.0

See merge request gitlab-org/gitlab-ce!23261
2018-11-27 11:18:36 +00:00
Douwe Maan d3f033d69c Merge branch 'bvl-use-shell-writeref' into 'master'
Don't use rugged write-ref anymore

See merge request gitlab-org/gitlab-ce!23286
2018-11-27 08:56:26 +00:00
Thong Kuah 685218c423 Upgrade kubeclient to 4.0.0
Bumps kubeclient and its dependencies from 3.1.0 to 4.0.0.
2018-11-27 10:52:10 +13:00
Bob Van Landuyt 5e9921d547 Update gitaly and gitaly-proto 2018-11-26 16:44:26 +01:00
Stan Hu 48d29f1417 Upgrade better_errors gem to 2.5.0
This gem is only used for development, and the latest version has been
tested with Rails 5/Ruby 2.5.

Changes: https://github.com/BetterErrors/better_errors/releases
2018-11-22 15:18:04 -08:00
Stan Hu 5b42ebbf24 Upgrade escape_utils to 1.2.1
This matches the version shipped in gitaly-ruby.

The main changes between 1.1.1 and 1.2.1 are CI-related
improvements:
https://github.com/brianmario/escape_utils/compare/1.1.1...1.2.1
2018-11-20 10:09:19 -08:00
Douglas Barbosa Alexandre 8a581d531b Merge branch 'sh-bump-gems-security' into 'master'
Bump nokogiri, loofah, and rack gems for security updates

See merge request gitlab-org/gitlab-ce!23204
2018-11-19 23:29:15 +00:00
Stan Hu eded081522
Bump nokogiri, loofah, and rack gems for security updates
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
e5d58031b7

i18n: https://github.com/svenfuchs/i18n/releases

concurrent-ruby: https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md
2018-11-19 20:21:18 -02:00
Stan Hu 1ecf096207
Bump ruby_parser to 3.11.0 for Ruby 2.5 compatibility
See https://github.com/seattlerb/ruby_parser/blob/master/History.rdoc
2018-11-19 20:11:21 -02:00
Sean McGivern 7548c4d5af Merge branch '54004-update-asana-to-0.8.1' into 'master'
Update asana to 0.8.1

Closes #54004

See merge request gitlab-org/gitlab-ce!23039
2018-11-19 09:58:59 +00:00
Sean McGivern 96fb16743d Merge branch 'sh-use-nakayoshi-fork' into 'master'
Improve memory performance by reducing dirty pages before fork

See merge request gitlab-org/gitlab-ce!23169
2018-11-19 08:33:54 +00:00
Takuya Noguchi 8759096456 Update asana to 0.8.1
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2018-11-19 17:30:25 +09:00
Rémy Coutable d892df9adc Merge branch '54010-update-asciidoctor-to-1.5.8' into 'master'
Update asciidoctor to 1.5.8

Closes #54010

See merge request gitlab-org/gitlab-ce!23047
2018-11-19 07:42:51 +00:00
Stan Hu d991ea6ddd Improve memory performance by reducing dirty pages after fork()
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.
2018-11-18 00:46:27 -08:00
Rémy Coutable b27db6cf0a
Use the new parallel keyword in .gitlab-ci.yml
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-11-15 14:34:41 +01:00
Takuya Noguchi 4166ce773b Update asciidoctor to 1.5.8
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2018-11-15 00:33:48 +09:00
Sean McGivern af3a73ef9c Merge branch 'switch-rails' into 'master'
Switch to Rails 5

Closes #14286 and #48991

See merge request gitlab-org/gitlab-ce!21492
2018-11-14 14:01:14 +00:00
Jan Provaznik f6d368c748 Minor gem fixes 2018-11-14 12:41:16 +01:00
Jan Provaznik 547dc7ac60 Switch to Rails 5 by default
* updates Gemfile
* uses Rails 5 unless explicitly disabled
2018-11-14 12:38:30 +01:00