summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'pawel/use-released-prometheus-version' into 'master'Stan Hu2018-02-081-1/+1
|\ | | | | | | | | Use prometheus-client-mmap released, final version See merge request gitlab-org/gitlab-ce!16984
| * Use prometheus-client-mmap released, final versionpawel/use-released-prometheus-versionPawel Chojnacki2018-02-071-1/+1
| |
* | Migrate Git::Blob.batch to GitalyAhmad Sherif2018-02-081-1/+1
|/ | | | Closes gitaly#985
* Update prometheus gem to version 0.9.1.pre.rc.2 fixing segfaults happening ↵prometheus-gem-update-to-version-0.9.1.pre.rc.1Pawel Chojnacki2018-02-071-1/+1
| | | | on metrics deletion
* Downgrade google-protobufZeger-Jan van de Weg2018-02-061-0/+2
|
* Allow moving wiki pages from the UIFrancisco Javier López2018-02-051-0/+4
|
* Merge branch 'zj-fix-flay' into 'master'Rémy Coutable2018-02-051-1/+1
|\ | | | | | | | | | | | | Fix flay not detecting identical code Closes #42628 See merge request gitlab-org/gitlab-ce!16828
| * Upgrade Flay to have fewer parsing errorsZeger-Jan van de Weg2018-01-311-1/+1
| | | | | | | | | | | | Gem is updated from 2.8 to 2.10. [changelog][1] [1]: https://github.com/seattlerb/flay/blob/master/History.rdoc
* | Migrate Git::Repository#delete_refs to Gitalyfeature/migrate-delete-refs-to-gitalyAhmad Sherif2018-01-301-1/+1
| | | | | | | | Closes gitaly#967
* | Merge branch 'feature/migrate-wiki-page-formatted-data-to-gitaly' into 'master'Robert Speicher2018-01-301-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Migrate fetching wiki page formatted content to Gitaly Closes gitaly#958 See merge request gitlab-org/gitlab-ce!16716
| * | Migrate fetching wiki page formatted content to Gitalyfeature/migrate-wiki-page-formatted-data-to-gitalyAhmad Sherif2018-01-301-1/+1
| | | | | | | | | | | | Closes gitaly#958
* | | Update Nokogiri to 1.8.2Rémy Coutable2018-01-301-1/+1
| |/ |/| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Avoid loading rspec-parameterized to avoid warningsLin Jen-Shin2018-01-261-1/+1
|/ | | | | | | | | | | | | for parser which is emitting: ``` warning: parser/current is loading parser/ruby23, which recognizes warning: 2.3.5-compliant syntax, but you are running 2.3.6. warning: please see https://github.com/whitequark/parser#compatibility-with-ruby-mri. ``` There's no easy way to disable this, and we're already using the latest version. This should be harmless anyway.
* Migrate restoring repo from bundle to Gitalyfeature/migrate-repo-restorer-to-gitalyAhmad Sherif2018-01-241-1/+1
| | | | Closes gitaly#946
* Migrate repository bundling to Gitalyfeature/migrate-bundle-to-disk-to-gitalyAhmad Sherif2018-01-241-1/+1
| | | | Closes gitaly#929
* Incorporate Gitaly's OperationService.UserCommitFiles RPCgitaly-user-commit-filesAlejandro Rodríguez2018-01-221-1/+1
|
* Update rubocop, rubocop-rspec, and gitlab-styles42187-update-gitlab-styles-to-2-3-0Rémy Coutable2018-01-181-3/+3
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Use the fast_blank gemadd-fast-blankdosire2018-01-161-0/+3
| | | | See https://github.com/rails/rails/pull/24658#issuecomment-212651965
* Update seed-fu to a version compatible with postgresql 10Nick Thomas2018-01-161-1/+1
|
* Migrate importing repository to Gitalyfeature/migrate-import-repository-to-gitalyAhmad Sherif2018-01-151-1/+1
| | | | Closes gitaly#907
* Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-111-3/+0
|\ | | | | | | | | | | | | Remove soft removals related code Closes #37447 See merge request gitlab-org/gitlab-ce!15789
| * Remove soft removals related codeYorick Peterse2018-01-081-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes all usage of soft removals except for the "pending delete" system implemented for projects. This in turn simplifies all the query plans of the models that used soft removals. Since we don't really use soft removals for anything useful there's no point in keeping it around. This _does_ mean that hard removals of issues (which only admins can do if I'm not mistaken) can influence the "iid" values, but that code is broken to begin with. More on this (and how to fix it) can be found in https://gitlab.com/gitlab-org/gitlab-ce/issues/31114. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37447
* | Add support for multiple refmaps to RemoteService#add_remotefix/use-mirror-refmaps-instead-mirror-refmapAhmad Sherif2018-01-091-1/+1
| | | | | | | | Closes gitaly#903
* | Fixing bug related to wiki last versionFrancisco Javier López2018-01-091-0/+4
| |
* | Merge branch 'rs-update-rack-cors' into 'master'Nick Thomas2018-01-081-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Update rack-cors from 0.4.0 to 1.0.2 Closes #41199 See merge request gitlab-org/gitlab-ce!16183
| * | Update rack-cors from 0.4.0 to 1.0.2Robert Speicher2018-01-021-1/+1
| | |
* | | Update scss-lint to 0.56.0Takuya Noguchi2018-01-081-1/+1
| |/ |/|
* | Merge branch 'migrate-fork-repo-to-gitaly' into 'master'Robert Speicher2018-01-031-1/+1
|\ \ | |/ |/| | | | | | | | | Migrate repo forking to Gitaly Closes gitaly#825 See merge request gitlab-org/gitlab-ce!16018
| * Migrate repo forking to Gitalymigrate-fork-repo-to-gitalyAhmad Sherif2018-01-021-1/+1
| | | | | | | | Closes gitaly#825
* | Update prometheus gem to version that adds inf+ bucket in accordance with ↵Pawel Chojnacki2018-01-021-1/+1
| | | | | | | | Prometheus docs.
* | Merge branch 'bump_mysql_gem' into 'master'Robert Speicher2017-12-281-1/+1
|\ \ | |/ |/| | | | | Bumped mysql2 gem version from 0.4.5 to 0.4.10. See merge request gitlab-org/gitlab-ce!16034
| * Bumped mysql2 gem version from 0.4.5 to 0.4.10.asaparov2017-12-211-1/+1
| |
* | Merge branch 'gitaly-remotes' into 'master'Dmitriy Zaporozhets2017-12-251-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Incorporate Gitaly's RemoteService RPCs Closes gitaly#852 See merge request gitlab-org/gitlab-ce!16060
| * | Incorporate Gitaly's RemoteService RPCsgitaly-remotesAlejandro Rodríguez2017-12-221-1/+1
| |/
* | Use gitlab-stylesRémy Coutable2017-12-221-3/+5
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Load commit in batches for pipelines#indexZeger-Jan van de Weg2017-12-191-1/+1
| | | | | | | | | | Uses `list_commits_by_oid` on the CommitService, to request the needed commits for pipelines. These commits are needed to display the user that created the commit and the commit title. This includes fixes for tests failing that depended on the commit being `nil`. However, now these are batch loaded, this doesn't happen anymore and the commits are an instance of BatchLoader.
* Merge branch 'rc/use-factory_bot_rails' into 'master'Robert Speicher2017-12-151-1/+1
|\ | | | | | | | | Replace factory_girl_rails with factory_bot_rails See merge request gitlab-org/gitlab-ce!15919
| * Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_railsRémy Coutable2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | I've followed the [upgrade guide](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md) and ran these two commands: ``` grep -e FactoryGirl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|FactoryGirl|FactoryBot|" grep -e factory_girl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|factory_girl|factory_bot|" ``` Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'feature/migrate-merge-base-to-gitaly' into 'master'Robert Speicher2017-12-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#merge_base_commit to Gitaly Closes gitaly#808 See merge request gitlab-org/gitlab-ce!15770
| * | Migrate Gitlab::Git::Repository#merge_base_commit to Gitalyfeature/migrate-merge-base-to-gitalyAhmad Sherif2017-12-131-1/+1
| | | | | | | | | | | | Closes gitaly#808
* | | Update flipper to 0.11.0 and take advantage of the new featuresrc/update-flipperRémy Coutable2017-12-141-2/+3
| |/ |/| | | | | | | | | | | | | - Added an ActiveSupport (using Rails.cache) caching adapter - Overview of the new features can be found at https://johnnunemaker.com/flippin-features-at-runtime/ - Full Changelog can be found at https://github.com/jnunemaker/flipper/blob/v0.11.0/Changelog.md Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Properly bump prometheus-client-mmap gem versionssh-bump-prometheus-gem-properlyStan Hu2017-12-091-1/+1
|/ | | | Only the Gemfile.lock was updated before.
* Resolve "Include asset_sync gem"Ian Baum2017-12-081-0/+3
|
* Bump redis-rails to 5.0.2 to get redis-store security updatesStan Hu2017-12-061-1/+1
|
* Migrate Gitlab::Git::Repository#revert to Gitalyfeature/migrate-revert-to-gitalyAhmad Sherif2017-12-051-1/+1
| | | | Closes gitaly#780
* Merge branch 'feature/migrate-cherry-pick-to-gitaly' into 'master'Robert Speicher2017-12-041-1/+1
|\ | | | | | | | | | | | | Migrate Gitlab::Git::Repository#cherry_pick to Gitaly Closes gitaly#737 See merge request gitlab-org/gitlab-ce!15517
| * Migrate Gitlab::Git::Repository#cherry_pick to GitalyAhmad Sherif2017-12-041-1/+1
| | | | | | | | Closes gitaly#737
* | Update Rails to 4.2.10Rémy Coutable2017-12-011-1/+1
|/ | | | | | | | | | | | | Changes since 4.2.8: - [No change in ActionMailer](https://github.com/rails/rails/blob/v4.2.10/actionmailer/CHANGELOG.md) - [1 change and 1 regression fix in ActionPack](https://github.com/rails/rails/blob/v4.2.10/actionpack/CHANGELOG.md) - [No change in ActiveModel](https://github.com/rails/rails/blob/v4.2.10/activemodel/CHANGELOG.md) - [7 fixes in ActiveRecord](https://github.com/rails/rails/blob/v4.2.10/activerecord/CHANGELOG.md) - [5 fixes in ActiveSupport](https://github.com/rails/rails/blob/v4.2.10/activesupport/CHANGELOG.md) - [No change in Railties](https://github.com/rails/rails/blob/v4.2.10/railties/CHANGELOG.md) Signed-off-by: Rémy Coutable <remy@rymai.me>
* Pin seed-fu to 2.3.6 since 2.3.7 is brokenRémy Coutable2017-11-301-1/+1
| | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/40690 and https://github.com/mbleigh/seed-fu/issues/123 for details. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '40568-bump-seed-fu-to-2-3-7' into 'master'Rémy Coutable2017-11-281-1/+1
|\ | | | | | | | | | | | | Upgrade seed-fu to 2.3.7 Closes #40568 See merge request gitlab-org/gitlab-ce!15607
View Lorry Controller Status