summaryrefslogtreecommitdiff
path: root/config/initializers
Commit message (Collapse)AuthorAgeFilesLines
* Fix #44332 - Add support for profile and emailGotenXiao2019-02-061-2/+21
|
* Merge branch '52568-external-mr-diffs' into 'master'Sean McGivern2019-02-061-0/+8
|\ | | | | | | | | | | | | Allow merge request diffs to be placed into an object store Closes #52568 See merge request gitlab-org/gitlab-ce!24276
| * Allow MR diffs to be placed into an object storeNick Thomas2019-02-051-0/+8
| |
* | Monkey-patch Sprockets to prevent cache ballooningRémy Coutable2019-02-051-0/+3
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Add OpenTracing instrumentation for Action View Render eventsAndrew Newdigate2019-01-301-0/+1
| | | | | | | | | This change adds three new instrumentations, driven through rails notifications: render_template.action_view, render_collection.action_view and render_partial.action_view. These can help developers understand why renders are taking a long time which may in turn help them to improve their performance.
* Merge branch '54250-upstream-kubeclient-redirect-patch' into 'master'Kamil Trzciński2019-01-251-22/+0
|\ | | | | | | | | | | | | Use http_max_redirects opt to replace monkeypatch Closes #54250 See merge request gitlab-org/gitlab-ce!24284
| * Use http_max_redirects opt to replace monkeypatchThong Kuah2019-01-251-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | http_max_redirects was introduced in 4.2.2, so upgrade kubeclient. The monkey-patch was global so we will have to check that all instances of Kubeclient::Client are handled. Spec all methods of KubeClient This should provide better confidence that we are indeed disallowing redirection in all cases
* | Merge branch 'an-opentracing-active-record-tracing' into 'master'Kamil Trzciński2019-01-251-0/+3
|\ \ | |/ |/| | | | | Adds tracing support for ActiveRecord notifications See merge request gitlab-org/gitlab-ce!24604
| * Adds tracing support for ActiveRecord notificationsAndrew Newdigate2019-01-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | This change will publish distributed tracing spans related to SQL ActiveRecord queries. These queries are unbound, so will still contain parameter substitution strings in place of actual parameter values. This ensures that the SQL strings do not need to be scrubbed, since the values are not included in the SQL. More details of rails instrumentation can be found here: https://guides.rubyonrails.org/active_support_instrumentation.html
* | Enable the Layout/ExtraSpacing cop56392-enable-the-layout-extraspacing-copRémy Coutable2019-01-243-3/+3
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch ↵Nick Thomas2019-01-231-0/+41
|\ \ | |/ |/| | | | | | | | | | | | | '52674-api-v4-projects-project_id-jobs-endpoint-hits-statement-timeout' into 'master' [API] Omit `X-Total` and `X-Total-Pages` headers when items count is more than 10,000 Closes #42194 and #52674 See merge request gitlab-org/gitlab-ce!23931
| * [API] Omit X-Total{,-Pages} when count > 10kRémy Coutable2019-01-221-0/+41
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'an-opentracing-propagation' into 'master'Kamil Trzciński2019-01-221-0/+20
|\ \ | |/ |/| | | | | Adds inter-service OpenTracing propagation See merge request gitlab-org/gitlab-ce!24239
| * Adds inter-service OpenTracing propagationAndrew Newdigate2019-01-221-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows the GitLab rails and sidekiq components to receive tracing spans from upstream services such as Workhorse and pass these spans on to downstream services including Gitaly and Sidekiq. This change will also emit traces for incoming and outgoing requests using the propagated trace information. This will allow operators and engineers to view traces across the Workhorse, GitLab Rails, Sidekiq and Gitaly components. Additional intra-service instrumentation will be added in future changes.
* | Merge branch 'raise-on-unfiltered-params' into 'master'Rémy Coutable2019-01-211-2/+0
|\ \ | |/ |/| | | | | Set ActionController raise_on_unfiltered_parameters to true See merge request gitlab-org/gitlab-ce!24443
| * Actually set raise_on_unfiltered_parameters to trueJasper Maes2019-01-161-2/+0
| |
* | Conditionally initialize the global opentracing tracerAndrew Newdigate2019-01-171-0/+13
|/ | | | | | | | | | | | | | | | | This change will instantiate an OpenTracing tracer and configure it as the global tracer when the GITLAB_TRACING environment variable is configured. GITLAB_TRACING takes a "connection string"-like value, encapsulating the driver (eg jaeger, etc) and options for the driver. Since each service, whether it's written in Ruby or Golang, uses the same connection-string, it should be very easy to configure all services in a cluster, or even a single development machine to be setup to use tracing. Note that this change does not include instrumentation or propagation changes as this is a way of breaking a previous larger change into components. The instrumentation and propagation changes will follow in separate changes.
* Extract process_name from GitLab::SentryAndrew Newdigate2019-01-161-1/+1
| | | | | | | | GitLab::Sentry has a program_context method to determine whether a Sentry exception occurred in Sidekiq or rails. Since we will need similar functionality for distributed tracing, this change extracts the program_context method into GitLab.process_name for more general consumption.
* Add SSE-C key configuration option for Amazon S3 remote backupsPepijn Van Eeckhoudt2019-01-091-0/+1
|
* Merge branch 'kamil-refactor-ci-builds-v5' into 'master'Grzegorz Bizon2019-01-061-0/+31
|\ | | | | | | | | Use BuildMetadata to store build configuration in JSONB form See merge request gitlab-org/gitlab-ce!21499
| * Add config_options|variables to BuildMetadatakamil-refactor-ci-builds-v5Kamil Trzciński2019-01-041-0/+31
| | | | | | | | | | | | | | | | | | | | | | These are data columns that store runtime configuration of build needed to execute it on runner and within pipeline. The definition of this data is that once used, and when no longer needed (due to retry capability) they can be freely removed. They use `jsonb` on PostgreSQL, and `text` on MySQL (due to lacking support for json datatype on old enough version).
* | Merge branch 'deprecated-callback-false' into 'master'Robert Speicher2019-01-041-3/+0
|\ \ | |/ |/| | | | | Fix deprecation: returning false in Active Record and Active Model callbacks See merge request gitlab-org/gitlab-ce!24134
| * Fix deprecation: returning false in Active Record and Active Model callbacks ↵Jasper Maes2019-01-031-3/+0
| | | | | | | | will not implicitly halt a callback chain
* | Add support for explicit index orderAndreas Brandl2019-01-031-3/+9
|/ | | | | | | | ActiveRecord supports `:order` natively, but it is skipped because of our specific patch to support opclasses. Relevant AR code: https://github.com/rails/rails/blob/5-0-stable/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb#L1167
* Support both 0 and NULL lock_versionsDouwe Maan2018-12-271-6/+2
|
* Make it clear that monkey patch is no longer needed in Rails 5.1Douwe Maan2018-12-272-3/+6
|
* Bump CarrierWave to 1.3.0 and remove monkey patchesStan Hu2018-12-241-42/+0
| | | | | Full list of changes: https://github.com/carrierwaveuploader/carrierwave/blob/master/CHANGELOG.md
* Always load the metrics the lastLin Jen-Shin2018-12-211-0/+3
| | | | | Because this could potentially load a model and we shouldn't load models before all the patches we have in places.
* Load the devise initializer before metricsBob Van Landuyt2018-12-181-0/+0
| | | | | | Metrics tries to initialize the `EventsFinder` to instrumnt it. The `EventsFinder` tries to load the `Event` model, which in turn loads the `User` model. Loading the `User` model requires Devise to be initialized. So to avoid problems around this, we load devise before loading metrics.
* Merge branch 'sh-carrierwave-patch-google-acl' into 'master'Sean McGivern2018-12-181-0/+13
|\ | | | | | | | | | | | | Fix object storage not working properly with Google S3 compatibility Closes #53846 See merge request gitlab-org/gitlab-ce!23858
| * Fix object storage not working properly with Google S3 compatibilityStan Hu2018-12-171-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Even in AWS S3 compatibility mode, Google now appears to reject requests that includes this header with this error: ``` Requests cannot specify both x-amz and x-goog headers ``` This has been submitted upstream via https://github.com/carrierwaveuploader/carrierwave/pull/2356. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53846.
* | Bump gitlab-reliable-fetcher gemValery Sizov2018-12-171-1/+3
|/
* Remove rails 4 support in CI, Gemfiles, bin/ and config/Jasper Maes2018-12-1412-302/+96
|
* Fix deprecations in opclasses initializerYorick Peterse2018-12-121-1/+1
| | | | | | The use of `table_exists?` in the opclasses support initializer triggers a deprecation warning. Using `data_source_exists?` removes this deprecation.
* Merge branch 'dm-remove-prune-web-hook-logs-worker' into 'master'Robert Speicher2018-12-071-4/+0
|\ | | | | | | | | | | | | Remove RemoveOldWebHookLogsWorker Closes #52592 See merge request gitlab-org/gitlab-ce!23628
| * Remove RemoveOldWebHookLogsWorkerDouwe Maan2018-12-071-4/+0
| |
* | Merge branch 'store-correlation-logs' into 'master'Stan Hu2018-12-074-1/+8
|\ \ | | | | | | | | | | | | Log and pass correlation-id between Unicorn, Sidekiq and Gitaly See merge request gitlab-org/gitlab-ce!22844
| * | Log and pass correlation-id between Unicorn, Sidekiq and GitalyKamil Trzciński2018-12-064-1/+8
| |/ | | | | | | | | | | | | | | The Correlation ID is taken or generated from received X-Request-ID. Then it is being passed to all executed services (sidekiq workers or gitaly calls). The Correlation ID is logged in all structured logs as `correlation_id`.
* | Disable Sidekiq feature flag check if features table does not existStan Hu2018-12-061-1/+1
|/ | | | | | | | The GitLab Development Kit initialization failed because the Sidekiq initializer was attempting to look up a feature flag when the `features` table hadn't been created yet. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54718
* Disable format determination based on path extensionDouwe Maan2018-12-031-0/+19
|
* Add config to disable impersonationImre Farkas2018-11-291-0/+1
| | | | | | | | Adds gitlab.impersonation_enabled config option defaulting to true to keep the current default behaviour. Only the act of impersonation is modified, impersonation token management is not affected.
* Merge branch 'security-email-change-notification' into 'master'Cindy Pallares2018-11-281-0/+3
| | | | | [master] Resolve: "Provide email notification when a user changes their email address" See merge request gitlab/gitlabhq!2587
* Merge branch 'security-fix-uri-xss-applications' into 'master'Cindy Pallares2018-11-281-0/+7
| | | | | [master] Resolve "Reflected XSS in OAuth Authorize window due to redirect_uri allowing arbitrary protocols" See merge request gitlab/gitlabhq!2572
* Merge branch 'security-fix-pat-web-access' into 'master'Cindy Pallares2018-11-281-5/+5
| | | | | [master] Resolve "Personal access token with only `read_user` scope can be used to authenticate any web request" See merge request gitlab/gitlabhq!2583
* Correctly handle data-loss scenarios when encrypting columnsNick Thomas2018-11-271-2/+22
| | | | | | | | | If the EncryptColumns background migration runs in a sidekiq with a stale view of the database schema, or when the purported destination columns don't actually exist, data loss can result. Attempt to work around these issues by reloading schema information before running the migration, and raising errors if the model reports that any of its source or destination columns are missing.
* Remove monkeypatch as now present in upstreamThong Kuah2018-11-271-15/+0
| | | | | See https://github.com/abonas/kubeclient/blob/v4.0.0/lib/kubeclient/common.rb#L395
* Clear BatchLoader context between Sidekiq jobsDouwe Maan2018-11-221-0/+1
|
* Fix index for mysql adapterJan Provaznik2018-11-141-16/+34
| | | | | | | | | * similar to rails 5 it assures that index length is set for blob columns also in rails 4 * it also ignores multiple definitions of indexes for mysql, for some tables we define multiple indexes on the same set of columns, but with different parameters (opclasses, where), these are not supported by mysql adapter so the second definition of index is skipped
* Fix syntax error in initializers/fill_shardsDmitriy Zaporozhets2018-11-071-4/+3
|
* Merge branch 'remove-asset-sync' into 'master'Marin Jankovski2018-11-071-31/+0
|\ | | | | | | | | | | | | Remove asset_sync gem and related code Closes omnibus-gitlab#3872 See merge request gitlab-org/gitlab-ce!22610