summaryrefslogtreecommitdiff
path: root/config/initializers
Commit message (Collapse)AuthorAgeFilesLines
* Refactor inside_transaction? to Gitlab::DatabaseAndrew Newdigate2019-06-251-1/+1
| | | | | | | This is a small change to move AfterCommitQueue.inside_transaction? to Gitlab::Database.inside_transaction? Since this change is required by different changes which may not arrive in sequence, it's easier to extract this change out on it's own.
* Renew Let's Encrypt certificatesVladimir Shushlin2019-06-241-0/+4
| | | | | | | | Add index for pages domain ssl auto renewal Add PagesDomain.needs_ssl_renewal scope Add cron worker for ssl renewal Add worker for ssl renewal Add pages ssl renewal worker queues settings
* Merge branch 'config-yaml-differences' into 'master'Robert Speicher2019-06-201-0/+14
|\ | | | | | | | | Backport changes made by EE to various YAML configuration files See merge request gitlab-org/gitlab-ce!29606
| * Backport gitlab.yml.example from EEconfig-yaml-differencesYorick Peterse2019-06-201-0/+14
| | | | | | | | | | | | | | | | To make this happen, we need to conditionally add the group_saml strategy when running tests, but only on EE. This requires some changes to Gitlab.ee? so that it can be used before/without loading the Rails environment. We also have to change how we require a few files, so this can run outside of Rails.
* | Only support postgresqlNick Thomas2019-06-191-0/+4
|/ | | | MySQL support has been removed
* Add back sidekiq metrics exporterrc/add_back_sidekiq_exporterRyan Cobb2019-06-131-0/+6
|
* Moved RackTimeout observer to a different locationJan Provaznik2019-06-121-1/+1
| | | | | Because there will be similar observer for PumaWorkerKiller, it makes sense to keep both on better place.
* Adds sidekiq worker label for ruby metricsRyan Cobb2019-06-061-6/+0
|
* Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-06-032-3/+52
|\
| * Protect Gitlab::HTTP against DNS rebinding attackDouwe Maan2019-05-302-3/+52
| | | | | | | | | | | | Gitlab::HTTP now resolves the hostname only once, verifies the IP is not blocked, and then uses the same IP to perform the actual request, while passing the original hostname in the `Host` header and SSL SNI field.
* | Added rack-timeout for PumaJan Provaznik2019-05-291-0/+23
| | | | | | | | | | | | | | It assures that requests are aborted after 60 seconds, otherwise an exception is raised. This exception is logged by Sentry, also there is a Prometheus counter for measuring number of requests in each state.
* | Add Puma samplerJan Provaznik2019-05-292-1/+8
|/ | | | | This sampler gathers Puma-specific metrics which can be used by Prometheus then.
* Store Let's Encrypt private key in settingsVladimir Shushlin2019-05-281-6/+1
| | | | | | | | | | | | | | | | Storing this key in secrets.yml was a bad idea, it would require users using HA setups to manually replicate secrets across nodes during update, it also needed support from omnibus package * Revert "Generate Let's Encrypt private key" This reverts commit 444959bfa0b79e827a2a1a7a314acac19390f976. * Add Let's Encrypt private key to settings as encrypted attribute * Generate Let's Encrypt private key in database migration
* Changes RackAttack logger to use structured logsMayra Cabrera2019-05-241-1/+9
| | | | | | | | Creates a new filename to register auth logs. This change should allow SRE's queries to make better queries through logging infrastructure. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54528
* Bump devise to 4.6Utkarsh Gupta2019-05-211-0/+5
| | | | Signed-off-by: Utkarsh Gupta <guptautkarsh2102@gmail.com>
* Fix typos in the whole gitlab-ce projectYoginth2019-05-201-1/+1
|
* Merge branch 'include-ee-fixtures' into 'master'12-0-auto-deploy-0009646Stan Hu2019-05-111-0/+4
|\ | | | | | | | | Add EE fixtures to SeedFu fixture paths See merge request gitlab-org/gitlab-ce!28241
| * Add EE fixtures to SeedFu pathinclude-ee-fixturesBalasankar "Balu" C2019-05-101-0/+4
| | | | | | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* | Add warning about updating Omnibus is secrets are updatedsh-add-omnibus-secretsStan Hu2019-05-101-0/+11
|/ | | | [ci skip]
* Generate Let's Encrypt private keyVladimir Shushlin2019-05-091-1/+6
|
* Additional fix to handle NULL lock_versionsh-fix-activerecord-patch-mark2Stan Hu2019-05-061-1/+5
| | | | | | | | | | | | | | If the UI sends a string value for lock_version (e.g. "0"), then the previous monkey patch did not properly handle that properly. This commit casts the value to an integer to determine whether to look for NULL lock_versions. For merge requests, GitLab sends a POST request to `namespace/project/merge_requests/:iid` with the `merge_request[lock_version]` parameter with a string `0`. The string value comes from the form field, which explains why https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28145 wasn't sufficient.
* Fix editing issues and MRs with NULL lock_versionSean McGivern2019-05-061-0/+41
|
* Run rubocop -a on CE filessh-upgrade-rubocop-0.68.0-ceStan Hu2019-05-051-1/+1
|
* Include all queries in the performance bar summarySean McGivern2019-05-031-0/+12
| | | | | | | | | | | | Rails 5.1's `exec_no_cache` doesn't call `async_exec` any more, but `exec_params`: https://github.com/rails/rails/pull/33188 This means that the DB summary in the performance bar was wrong. The individual query details were still correct (we subscribe to ActiveRecord events for those). We can remove this once the upstream PR to peek-pg is in a release and we update to use that release.
* Allow Sentry client-side DSN to be passed on gitlab.ymlDouglas Barbosa Alexandre2019-05-011-0/+1
|
* Merge branch 'feat/sentry-environment' into 'master'Douglas Barbosa Alexandre2019-04-302-0/+9
|\ | | | | | | | | feat: add option to define the Sentry Environment See merge request gitlab-org/gitlab-ce!27091
| * feat: allow Sentry configuration to be passed on gitlab.ymlRoger Meier2019-04-302-0/+9
| |
* | Merge branch '60965-referencing-issues-or-epics-by-url-fails-with-404' into ↵Douglas Barbosa Alexandre2019-04-301-0/+2
|\ \ | |/ |/| | | | | | | | | | | | | 'master' Resolve "Referencing issues or epics by URL fails with 404" Closes #61099 and #60965 See merge request gitlab-org/gitlab-ce!27827
| * Don't allow a relative_url_root of '/'Sean McGivern2019-04-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This will fail in a few ways: 1. We might end up having a path (not a URL) starting with `//`, which will be interpreted by browsers as a protocol-relative URL. 2. Issue, MR, snippet, etc. reference parsing will look for URLs at `http://gitlab.example.com//project/...`, with the double slash preventing single slashes from working. In general, it doesn't seem like there's a valid case for this.
* | Remove disabled pages domainsVladimir Shushlin2019-04-301-0/+4
|/ | | | | Domain will be removed by verification worker after 1 week of being disabled
* Fix Sidekiq initializer fileValery Sizov2019-04-251-12/+12
|
* Enable Reliable fetcher by defaultValery Sizov2019-04-251-3/+14
|
* Fix project auto dev ops failureHeinrich Lee Yu2019-04-231-0/+2
|
* Bump Rails version to 5.1.7Heinrich Lee Yu2019-04-232-45/+0
| | | | Removes unneeded patches
* Upgrade Rails to 5.1.6.1Jasper Maes2019-04-237-172/+70
| | | | Model.new.attributes now also returns encrypted attributes.
* Migrate correlation and tracing code to LabKitan-use-labkitAndrew Newdigate2019-04-183-11/+9
| | | | | | | | | | | | | | | 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.
* Merge branch 'restore-hipchat' into 'master'Nick Thomas2019-04-111-0/+15
|\ | | | | | | | | | | | | Revert "Remove HipChat integration from GitLab" Closes #60042 See merge request gitlab-org/gitlab-ce!27172
| * Add frozen_string_literal to HipChat filesrestore-hipchatSean McGivern2019-04-101-0/+1
| |
| * Revert "Remove HipChat integration from GitLab"Sean McGivern2019-04-101-0/+14
| | | | | | | | This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac.
* | Disable method instrumentation for diffsStan Hu2019-04-101-1/+0
|/ | | | | | | | | When there a large number of discussions on diffs, the instrumentation has a significant impact on performance since it's often run in a tight loop for line position calculation etc. We should disable this since there are other ways to benchmark performance. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52898
* Add part of needed codeGosia Ksionek2019-04-051-0/+1
| | | | | | | | | | | | | | | | | Add columns to store project creation settings Add project creation level column in groups and default project creation column in application settings Remove obsolete line from schema Update migration with project_creation_level column existence check Rename migrations to avoid conflicts Update migration methods Update migration method
* Merge branch '54417-graphql-type-authorization' into 'master'Nick Thomas2019-04-041-0/+3
|\ | | | | | | | | | | | | GraphQL Type authorization Closes #54417 See merge request gitlab-org/gitlab-ce!25724
| * GraphQL Type authorizationLuke Duncalfe2019-04-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables authorizations to be defined on GraphQL Types. module Types class ProjectType < BaseObject authorize :read_project end end If a field has authorizations defined on it, and the return type of the field also has authorizations defined on it. then all of the combined permissions in the authorizations will be checked and must pass. Connection fields are checked by "digging" to find the type class of the "node" field in the expected location of edges->node. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54417
* | Prevent premailer from converting HTML entitiesHeinrich Lee Yu2019-04-041-1/+2
|/ | | | This prevents `&mdash` in our templates being change to `-`
* Load 'Gitlab::Jira::Middleware' if it existsFelipe Artur2019-04-011-0/+11
| | | | | Loads 'Gitlab::Jira::Middleware' only if it exists so this initializer can be backported to CE.
* Merge branch '54670-external-diffs-when-outdated' into 'master'Sean McGivern2019-03-281-0/+5
|\ | | | | | | | | | | | | Allow external diffs to be used conditionally Closes #54670 See merge request gitlab-org/gitlab-ce!25432
| * Allow external diffs to be used conditionallyNick Thomas2019-03-271-0/+5
| | | | | | | | | | | | | | | | | | | | Since external diffs are likely to be a bit slower than in-database ones, add a mode that makes diffs external after they've been obsoleted by events. This should strike a balance between performance and disk space. A background cron drives the majority of migrations, since diffs become outdated through user actions.
* | Log Gitaly RPC duration to api_json.log and production_json.logStan Hu2019-03-271-1/+6
|/ | | | | | | This makes it easier to debug Gitaly performance issues in the field. This commit also makes the tracking of query time thread-safe via RequestStore.
* Add helper method to return a human-friendly name for database adapterDouglas Barbosa Alexandre2019-03-211-1/+1
|
* Merge branch 'send-columns-to-sentry-on-missingattributeerror' into 'master'Stan Hu2019-03-191-0/+15
|\ | | | | | | | | Send schema cache to Sentry on MissingAttributeError See merge request gitlab-org/gitlab-ce!26331