summaryrefslogtreecommitdiff
path: root/Gemfile.rails4.lock
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Revert "Fix Gemfile.rails4.lock for Rails and gitlab-sidekiq-fetcher ↵Stan Hu2018-12-181-23/+23
| | | | | | bump"" This reverts commit 46ebef292392e7703b9d523a7b4af99ae53c5d6c.
* Revert "Fix Gemfile.rails4.lock for Rails and gitlab-sidekiq-fetcher bump"Stan Hu2018-12-181-23/+23
| | | | This reverts commit 58e2c6b6d709573e1403cc6132b9a8c61200c6d8.
* Fix Gemfile.rails4.lock for Rails and gitlab-sidekiq-fetcher bumpStan Hu2018-12-181-23/+23
|
* Merge branch 'fix-gemfile-rails-security-update' into 'master'Robert Speicher2018-12-061-10/+10
|\ | | | | | | | | Security update of gem rails to version 4.2.11 See merge request gitlab-org/gitlab-ce!23520
| * Security update of rails to version 4.2.11.Matthias Fechner2018-12-031-10/+10
| |
* | Add feature flag for workhorse content type calculationFrancisco Javier López2018-12-061-1/+2
| |
* | Update gitaly-proto to v1.3.0Nick Thomas2018-12-061-2/+2
| |
* | Upgrade rspec-parameterized to 0.4.1Stan Hu2018-12-051-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rspec-parameterized 0.4.0 fails spectacularly with Ruby 2.5.3 with the following error: ``` RuntimeError: No such frame, gone beyond end of stack! ``` This happens because of a Ruby bug in https://bugs.ruby-lang.org/issues/15105. The binding_of_caller gem induces this failure. This upgrade switches to the binding_of_ninja gem, which does not have the same problem.
* | Update batch-loader dependencyDouwe Maan2018-12-041-2/+2
|/
* Bump gpgme gem version from 2.0.13 to 2.0.18Abulhair Saparov2018-12-031-3/+3
|
* Manually edited the Gemfile.lock to make the gitlab-ce pipeline happy.Matthias Fechner2018-11-301-1/+1
|
* Merge branch '51083-fix-move-api' into 'master'Rémy Coutable2018-11-291-2/+2
|\ | | | | | | | | | | | | Commits API: Preserve file content in move operations if unspecified Closes #52974 et #51083 See merge request gitlab-org/gitlab-ce!23387
| * Commits API: Preserve file content in move operations if unspecifiedNick Thomas2018-11-281-2/+2
| |
* | Add monkey patch to unicorn to fix eof? problemKamil Trzciński2018-11-281-0/+1
|/ | | | | | | 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
* Merge branch 'upgrade_kubeclient_400' into 'master'Kamil Trzciński2018-11-271-6/+6
|\ | | | | | | | | Upgrade kubeclient to 4.0.0 See merge request gitlab-org/gitlab-ce!23261
| * Upgrade kubeclient to 4.0.0Thong Kuah2018-11-271-6/+6
| | | | | | | | Bumps kubeclient and its dependencies from 3.1.0 to 4.0.0.
* | Merge branch 'bvl-use-shell-writeref' into 'master'Douwe Maan2018-11-271-2/+2
|\ \ | |/ |/| | | | | Don't use rugged write-ref anymore See merge request gitlab-org/gitlab-ce!23286
| * Update gitaly and gitaly-protoBob Van Landuyt2018-11-261-2/+2
| |
* | Upgrade better_errors gem to 2.5.0sh-bump-better-errors-gemStan Hu2018-11-221-3/+4
|/ | | | | | | 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
* Upgrade escape_utils to 1.2.1sh-bump-escape-utilsStan Hu2018-11-201-1/+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
* Merge branch 'sh-bump-gems-security' into 'master'Douglas Barbosa Alexandre2018-11-191-6/+6
|\ | | | | | | | | Bump nokogiri, loofah, and rack gems for security updates See merge request gitlab-org/gitlab-ce!23204
| * Bump nokogiri, loofah, and rack gems for security updatesStan Hu2018-11-191-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Bump ruby_parser to 3.11.0 for Ruby 2.5 compatibilityStan Hu2018-11-191-3/+3
|/ | | | See https://github.com/seattlerb/ruby_parser/blob/master/History.rdoc
* Merge branch '54004-update-asana-to-0.8.1' into 'master'Sean McGivern2018-11-191-2/+2
|\ | | | | | | | | | | | | 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-2/+2
| | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Merge branch 'sh-use-nakayoshi-fork' into 'master'Sean McGivern2018-11-191-0/+2
|\ \ | |/ |/| | | | | 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/+2
| | | | | | | | | | | | | | | | 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-2/+2
|\ \ | |/ |/| | | | | | | | | 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-2/+2
| | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Use the new parallel keyword in .gitlab-ci.ymluse-parallel-ci-keywordRémy Coutable2018-11-151-2/+2
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'switch-rails' into 'master'Sean McGivern2018-11-141-3/+3
| | | | | | | Switch to Rails 5 Closes #14286 and #48991 See merge request gitlab-org/gitlab-ce!21492
* Minor gem fixesswitch-railsJan Provaznik2018-11-141-3/+3
|
* Switch to Rails 5 by defaultJan Provaznik2018-11-141-0/+1157
* updates Gemfile * uses Rails 5 unless explicitly disabled