summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Expand)AuthorAgeFilesLines
* Fix requiring the rubyzip GemYorick Peterse2019-01-301-1/+1
* Fix uninitialized constant with GitLab Pages deployStan Hu2019-01-291-1/+1
* Merge branch 'security-extract-pages-with-rubyzip-dev-11-7' into 'security-11-7'Yorick Peterse2019-01-241-0/+1
* Merge branch 'sh-bump-mini-test' into 'master'Lin Jen-Shin2019-01-031-1/+1
|\
| * Bump minitest to 5.11.3 to match Gitaly versionsh-bump-mini-testStan Hu2018-12-301-1/+1
* | Update gems in Gemfile and qa/Gemfile to be consistentStan Hu2019-01-021-4/+4
* | Merge branch 'blackst0ne-bump-rails-cve-2018-16476' into 'master'Grzegorz Bizon2019-01-021-1/+1
|\ \
| * | Bump Ruby on Rails to 5.0.7.1blackst0ne-bump-rails-cve-2018-16476blackst0ne2018-12-211-1/+1
* | | Merge branch 'sh-bump-omniauth-google-gem' into 'master'Sean McGivern2019-01-011-2/+2
|\ \ \
| * | | Upgrade Omniauth and JWT gems to switch away from Google+ APIStan Hu2018-12-281-2/+2
| | |/ | |/|
* | | Merge branch 'rails52-dbcleaner' into 'master'Stan Hu2018-12-311-1/+1
|\ \ \ | |/ / |/| |
| * | Bump database_cleaner versionJan Provaznik2018-12-211-1/+1
* | | Bump CarrierWave to 1.3.0 and remove monkey patchesStan Hu2018-12-241-4/+1
|/ /
* | Update minimum version of nokogiriPirate Praveen2018-12-211-1/+1
* | Fix sidekiq-reliable-fetch versionValery Sizov2018-12-191-1/+1
* | Merge branch 'zj-pool-destruction' into 'master'Kamil Trzciński2018-12-191-1/+1
|\ \
| * | Leave object pools when destroying projectsZeger-Jan van de Weg2018-12-191-1/+1
* | | Merge branch 'deprecated-alias-method-chain' into 'master'Rémy Coutable2018-12-181-1/+1
|\ \ \
| * | | Fix deprecation: alias_method_chain is deprecated. Please, use Module#prepend...Jasper Maes2018-12-171-1/+1
| |/ /
* | | Merge branch 'sh-carrierwave-patch-google-acl' into 'master'Sean McGivern2018-12-181-2/+3
|\ \ \ | |_|/ |/| |
| * | Fix object storage not working properly with Google S3 compatibilityStan Hu2018-12-171-2/+3
| |/
* | Bump gitlab-reliable-fetcher gemValery Sizov2018-12-171-1/+1
|/
* Remove rails 4 support in CI, Gemfiles, bin/ and config/Jasper Maes2018-12-141-27/+9
* Specify sass ~> 3.5 in GemfilePirate Praveen2018-12-121-0/+1
* Merge branch 'fix-gemfile-rails-security-update' into 'master'Robert Speicher2018-12-061-1/+1
|\
| * Security update of rails to version 4.2.11.Matthias Fechner2018-12-031-1/+1
* | Add feature flag for workhorse content type calculationFrancisco Javier López2018-12-061-0/+3
* | Update gitaly-proto to v1.3.0Nick Thomas2018-12-061-1/+1
* | Update batch-loader dependencyDouwe Maan2018-12-041-1/+1
|/
* Bump gpgme gem version from 2.0.13 to 2.0.18Abulhair Saparov2018-12-031-1/+1
* Currently a dependency for grape `~> 1.1` is defined but gitlab does not work...Matthias Fechner2018-11-291-1/+1
* Merge branch '51083-fix-move-api' into 'master'Rémy Coutable2018-11-291-1/+1
|\
| * Update Gitaly and gitaly-protoNick Thomas2018-11-271-1/+1
* | Add monkey patch to unicorn to fix eof? problemKamil Trzciński2018-11-281-0/+7
|/
* Merge branch 'upgrade_kubeclient_400' into 'master'Kamil Trzciński2018-11-271-1/+1
|\
| * Upgrade kubeclient to 4.0.0Thong Kuah2018-11-271-1/+1
* | Merge branch 'bvl-use-shell-writeref' into 'master'Douwe Maan2018-11-271-1/+1
|\ \ | |/ |/|
| * Update gitaly and gitaly-protoBob Van Landuyt2018-11-261-1/+1
* | Upgrade better_errors gem to 2.5.0sh-bump-better-errors-gemStan Hu2018-11-221-1/+1
|/
* Bump nokogiri, loofah, and rack gems for security updatesStan Hu2018-11-191-1/+1
* Merge branch '54093-the-default_value_for-gem-doesn-t-handle-actioncontroller...46166-add-constraints-that-prevent-ci_builds-from-being-associated-with-null-pipeline-projectSean McGivern2018-11-191-5/+8
|\
| * Use gitlab-default_value_with Rails 5Rémy Coutable2018-11-151-5/+8
* | Merge branch '54004-update-asana-to-0.8.1' into 'master'Sean McGivern2018-11-191-1/+1
|\ \
| * | Update asana to 0.8.1Takuya Noguchi2018-11-191-1/+1
* | | Merge branch 'sh-use-nakayoshi-fork' into 'master'Sean McGivern2018-11-191-0/+3
|\ \ \ | |/ / |/| |
| * | Improve memory performance by reducing dirty pages after fork()sh-use-nakayoshi-forkStan Hu2018-11-181-0/+3
| |/
* | Merge branch '54010-update-asciidoctor-to-1.5.8' into 'master'Rémy Coutable2018-11-191-1/+1
|\ \ | |/ |/|
| * Update asciidoctor to 1.5.8Takuya Noguchi2018-11-151-1/+1
* | Use the new parallel keyword in .gitlab-ci.ymluse-parallel-ci-keywordRémy Coutable2018-11-151-1/+1
|/
* Merge branch 'switch-rails' into 'master'Sean McGivern2018-11-141-1/+1
|\