summaryrefslogtreecommitdiff
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Upgrade to Rubocop 0.68.1Stan Hu2019-05-051-2/+3
| | | | | | | | | | | | This adds Ruby 2.6 support.
* | | Merge branch '18432-switch-to-sassc-rails' into 'master'Stan Hu2019-05-031-2/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Switch to sassc-rails for faster stylesheet compilation Closes #18432 See merge request gitlab-org/gitlab-ce!26224
| * | | Switch to sassc-rails for faster stylesheet compilation18432-switch-to-sassc-railsGabriel Mazetto2019-04-271-2/+1
| | | |
* | | | Add support for two-step Gitaly Rebase RPCLuke Duncalfe2019-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new two-step Gitaly `Rebase` RPC yields the rebase commit SHA to the client before proceeding with the rebase. This avoids an issue where the rebase commit SHA was returned when the RPC had fully completed, and in some cases this would be after the Rails `post_receive` worker services had already run. In these situations, the merge request did not yet have its rebase_commit_sha attribute set introducing the possibility for bugs (such as previous approvals being reset). https://gitlab.com/gitlab-org/gitlab-ee/issues/5966
* | | | Add opentracing integration for graphqlJan Provaznik2019-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends existing graphql's tracer with opentracing measurements. Because it also adds Tracing::Graphql class (for opentracing), it also renames Graphql::Tracing class to Graphql::GenericTracing to minimize confusion with similar class names.
* | | | Merge branch 'jc-client-for-fetch-objects-into-pool' into 'master'Stan Hu2019-04-301-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Add client methods for FetchIntoObjectPool RPC See merge request gitlab-org/gitlab-ce!27767
| * | | Add client methods for FetchIntoObjectPool RPCJohn Cai2019-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly's FetchIntoObjectPool RPC will idempotently fetch objects into an object pool. If the pool doesn't exist, it will create an empty pool before attempting the fetch. This change adds client code as well as specs to cover this behavior.
* | | | Disable method replacement in avatar loadingStan Hu2019-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've seen a significant performance penalty when using `BatchLoader#__replace_with!`. This defines methods on the batch loader that proxy to the 'real' object using send. The alternative is `method_missing`, which is slower. However, we've noticed that `method_missing` can be faster if: 1. The objects being loaded have a large interface. 2. We don't call too many methods on the loaded object. Avatar uploads meet both criteria above, so let's use the newly-released feature in https://github.com/exAspArk/batch-loader/pull/45. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60903
* | | | Upgrade letter_opener_web to support Rails 5.1Peter Leitzen2019-04-291-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit using `/rails/letter_opener` in `development` environment failed with: undefined method `before_filter' See https://github.com/fgrehm/letter_opener_web/issues/68 This commit upgrades `letter_opener_web` to 1.3.4 so Rails 5.1 is supported.
* | | Port changes for design management to CEBob Van Landuyt2019-04-291-0/+1
|/ / | | | | | | | | | | This ports the changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10462/ to CE
* | Added list_pages method to avoid loading all wiki pages contentFrancisco Javier López2019-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Inside a wiki, when we show the sidebar or browse to the `pages`, all page contents are retrieved from Gitaly and that is a waste of resources, since no content from that pages are going to be showed. This MR introduces the method `ProjectWiki#list_pages`, which uses new wiki_list_pages RPC call to retrieve pages without content Also in the `WikisController` we're using the method to show pages in the sidebar and also on the `pages` page.
* | Merge branch 'sh-upgrade-grpc-and-protobuf' into 'master'Nick Thomas2019-04-241-2/+2
|\ \ | | | | | | | | | | | | Bump gRPC to 1.19.0 and protobuf to 3.7.1 See merge request gitlab-org/gitlab-ce!27086
| * | Bump gRPC to 1.19.0 and protobuf to 3.7.1sh-upgrade-grpc-and-protobufStan Hu2019-04-221-2/+2
| | | | | | | | | | | | | | | | | | | | | These upgrades are necessary to support Ruby 2.6. This matches the Gitaly MR: https://gitlab.com/gitlab-org/gitaly/merge_requests/1066
* | | Merge branch 'upgrade-to-rails-5-1' into 'master'Rémy Coutable2019-04-231-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Upgrade Rails to 5.1 See merge request gitlab-org/gitlab-ce!27480
| * | | Bump Rails version to 5.1.7Heinrich Lee Yu2019-04-231-1/+1
| | | | | | | | | | | | | | | | Removes unneeded patches
| * | | Upgrade Rails to 5.1.6.1Jasper Maes2019-04-231-2/+2
| | | | | | | | | | | | | | | | Model.new.attributes now also returns encrypted attributes.
* | | | Merge branch 'sh-bump-sidekiq-5.2.6' into 'master'Robert Speicher2019-04-231-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Bump Sidekiq to 5.2.7 See merge request gitlab-org/gitlab-ce!27512
| * | | Bump Sidekiq to 5.2.7sh-bump-sidekiq-5.2.6Stan Hu2019-04-221-1/+1
| |/ / | | | | | | | | | | | | | | | Fixes minor bugs (https://github.com/mperham/sidekiq/blob/master/Changes.md#526) and keeps version used with gitlab-monitor consistent.
* | | Bump Nokogiri to 1.10.3sh-bump-nokogiri-1.10.3Stan Hu2019-04-221-1/+1
|/ / | | | | | | | | This pulls in a fix for libxslt that addresses CVE-2019-11068: https://github.com/sparklemotion/nokogiri/releases
* | Migrate correlation and tracing code to LabKitan-use-labkitAndrew Newdigate2019-04-181-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is a fairly straightforward refactor to extract the tracing and correlation-id code from the gitlab rails codebase into the new LabKit-Ruby project. The corresponding import into LabKit-Ruby was in https://gitlab.com/gitlab-org/labkit-ruby/merge_requests/1 The code itself remains very similar for now. Extracting it allows us to reuse it in other projects, such as Gitaly-Ruby. This will give us the advantages of correlation-ids and distributed tracing in that project too.
* | #57815 Omniauth UltraAuth strategyKartikey Tanna2019-04-171-0/+1
|/
* Merge branch '17014-remove-rails-deprecated_sanitizer' into 'master'Douwe Maan2019-04-151-1/+0
|\ | | | | | | | | | | | | Resolve "Remove rails-deprecated_sanitizer" Closes #17014 See merge request gitlab-org/gitlab-ce!27268
| * Remove rails-deprecated_sanitizer dependency17014-remove-rails-deprecated_sanitizerDmitriy Zaporozhets2019-04-121-1/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'update-capybara' into 'master'Stan Hu2019-04-121-3/+3
|\ \ | | | | | | | | | | | | Update capybara and selenium-webdriver See merge request gitlab-org/gitlab-ce!27201
| * | Update capybara and selenium-webdriverRémy Coutable2019-04-121-3/+3
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Enable RSpec/ExampleWording copThong Kuah2019-04-121-1/+1
|/
* Revert "Remove HipChat integration from GitLab"Sean McGivern2019-04-101-0/+3
| | | | This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac.
* Merge branch 'sh-update-rails-5.0.7.2' into 'master'Robert Speicher2019-04-051-1/+1
|\ | | | | | | | | | | | | Update Rails to 5.0.7.2 Closes #58963 See merge request gitlab-org/gitlab-ce!27022
| * Update Rails to 5.0.7.2Stan Hu2019-04-041-1/+1
| | | | | | | | | | | | | | This fixes a number of issues as described in https://weblog.rubyonrails.org/releases/. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58963
* | Bump rack gem to 2.0.7sh-bump-rack-2.0.7Stan Hu2019-04-041-4/+1
|/ | | | | | | | | | | This update has two important fixes: 1. It reverts the monkey patch introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23385 since https://github.com/rack/rack/pull/1201 is now part of the release. 2. Preserve forwarded IP address for trusted proxy chains (https://github.com/rack/rack/pull/1343).
* Download a folder from repositoryPatrick Bajao2019-04-021-1/+1
| | | | | | | | Add `GetArchiveRequest` to git-archive params. Modifies `Git::Repository#archive_metadata` to append `path` to `ArchivePrefix` so it'll not hit the cache of repository archive when it already exists.
* Upgrade `gitlab-markup` to 1.7.0Gabriel Mazetto2019-03-271-1/+1
| | | | | | | | | | | | | The new version requires `python3` to be available. In omnibus installation this is already a reality as we are currently pathing previous `gitlab-markup` version to use `python3` instead of `python2`. We are now requiring `python3` with the gem without having to patch it. As a consequence to also make it easy to use it in development, we've introduced a `Pipfile` and `Pipfile.lock`, working similarly to `Gemfile` and `Gemfile.lock`, and added documentation on how to use them.
* Upgrade bootstrap_form gemEnrique Alcantara2019-03-251-1/+1
| | | | - Also remove boostrap 4 migration adapter
* Merge branch 'dz-bump-httparty' into 'master'Stan Hu2019-03-201-1/+1
|\ | | | | | | | | | | | | Bump httparty to version 1.16.4 Closes #44342 See merge request gitlab-org/gitlab-ce!25893
| * Bump httparty to version 1.16.4Dmitriy Zaporozhets2019-03-191-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Bump Rugged to 0.28.0Stan Hu2019-03-191-1/+1
|/ | | | | | | | | | | | | | | | | | This version bump makes things consistent between Gitaly and fixes a significant number of bugs: https://github.com/libgit2/libgit2/releases This also decreases disk space of Omnibus builds by ~30 MB. There is also a workaround for https://github.com/libgit2/rugged/issues/785. If Gitaly or another process changes .gitconfig while Rugged has the file loaded, Rugged::Repository#each_key will report stale values unless a lookup is done first. This bug only manifests in a spec because we are using both Gitaly and Rugged at the same time there, and we normally don't use Rugged in the CE/EE code in this way.
* Update acts-as-taggable-on 5.0 -> 6.0Pirate Praveen2019-03-181-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'pravi/gitlab-ce-update-recaptcha' into 'master'Rémy Coutable2019-03-131-1/+1
|\ | | | | | | | | Update recaptcha gem from 3.x to 4.11 See merge request gitlab-org/gitlab-ce!25921
| * Update recaptcha 3.0 -> 4.11Pirate Praveen2019-03-081-1/+1
| |
* | Prefer node_modules At.js and jquery.carat versionsMike Greiling2019-03-131-1/+0
| | | | | | | | | | Remove references to the vendored copies of At.js and jquery.carat as well as the legacy rails wrapper gem.
* | Update rack-oauth2 1.2.1 -> 1.9.3Pirate Praveen2019-03-121-1/+1
| |
* | Remove select2-rails (select2 is now installed via yarn)Mike Greiling2019-03-081-1/+0
|/
* Revert "Merge branch 'remove-select2-rails' into 'master'"Marin Jankovski2019-03-081-0/+1
| | | This reverts merge request !17871
* remove select2-rails (select2 is now installed via yarn)Praveen Arimbrathodiyil2019-03-081-1/+0
|
* Accept force option on commit via APIPatrick Bajao2019-03-061-1/+1
| | | | | | | | When `force` is set to `true` and `start_branch` is set, the branch will be ovewritten with the new commit based on the `HEAD` of the `start_branch`. This commit includes changes to update the `gitaly-proto` gem.
* Merge branch 'add_ldap_tls_options' into 'master'Douwe Maan2019-03-051-1/+1
|\ | | | | | | | | | | | | Allow raw `tls_options` to be passed in LDAP configuration Closes #46391 See merge request gitlab-org/gitlab-ce!20678
| * Allow raw `tls_options` to be passed in LDAP configurationDrew Blessing2019-03-041-1/+1
| | | | | | | | | | | | | | We've previously exposed ca_file and ssl_version but there are many possible options that can be used inside tls_options. Instead of exposing individual ones, simply expose the entire hash so it can be passed in and we won't have to add things in the future.
* | Bump Bootsnap to 1.4.1Stan Hu2019-03-011-1/+1
|/ | | | | 1.4.1 contains a number of bug fixes and performance improvements: https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md
* Add a monkey patch that will squelch warnings for legacy Fog gemsStan Hu2019-02-281-1/+3
|
* Bump fog-aws to 3.3.0 and associated dependenciesStan Hu2019-02-281-6/+6
| | | | | Fixes issue with AWS V4 signatures not working with Ceph S3: https://github.com/fog/fog-aws/issues/462
View Lorry Controller Status