summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Use transactions in JS feature specsjs-specs-transactionsHeinrich Lee Yu2019-07-122-1/+4
| | | | | Uses Rails transactional tests instead of DatabaseCleaner transaction strategy because that doesn't work with JS tests
* Merge branch '64403-remove-setimmediate-polyfill' into 'master'Clement Ho2019-07-111-2/+4
|\ | | | | | | | | Remove setImmediate polyfill from production assets See merge request gitlab-org/gitlab-ce!30591
| * Remove setImmediate polyfill from production assetsMike Greiling2019-07-101-2/+4
| |
* | Merge branch 'improve-chaos-controller' into 'master'Stan Hu2019-07-111-5/+8
|\ \ | | | | | | | | | | | | | | | | | | Add `db_spin` and refactor ChaosController Closes #64425 See merge request gitlab-org/gitlab-ce!30559
| * | Add `db_spin` and refactor ChaosControllerimprove-chaos-controllerKamil Trzciński2019-07-111-5/+8
| | |
* | | Merge branch '35757-move-issues-in-boards-pderichs' into 'master'Jan Provaznik2019-07-111-1/+5
|\ \ \ | | | | | | | | | | | | | | | | Add endpoint to move issues in boards See merge request gitlab-org/gitlab-ce!30216
| * | | Add endpoint to move multiple issues35757-move-issues-in-boards-pderichsPatrick Derichs2019-07-111-1/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs for new endpoint to move multiple issues. Add changelog entry Just check the first issue for the ability to move / update Add specs for exceeding limits and malformed requests Changed name of shared examples Change title of changelog entry Use %i instead of %w Check permission to update issue on project instead of board Use admin_issue permission to check for issue move ability Changed variable name to avoid shadow issue_params method Rename route to bulk_move Change route definition Check permissions for each issue Combine methods for parameters permit check Remove extra context Change description of context Check param for type Array Add unit tests to MoveService Use before_action for permission check Use set instead of let! Use let's instead of set
* | | Merge branch '490-enable-puma-by-default-in-GDK' into 'master'Grzegorz Bizon2019-07-111-2/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Enable puma by default in GDK Closes gitlab-development-kit#490 See merge request gitlab-org/gitlab-ce!30285
| * | Enable puma by default in GDK490-enable-puma-by-default-in-GDKQingyu Zhao2019-07-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two changes: 1. Move bin/web to bin/web_unicorn(removed PUMA switching logic) Introduce new shadow script bin/web. Now we have 3 scripts working together: bin/web, bin/web_puma, bin/web_unicorn In bin/web, it checks ENV['USE_WEB_SERVER']: - if value is 'puma' or value is not set, call bin/web_puma - if value is 'unicorn', call bin/web_unicorn - report error if other values given 2. Gitlab rails allow ENV setting to override timeout - ENV['GITLAB_RAILS_RACK_TIMEOUT'] for service_timeout - ENV['GITLAB_RAILS_WAIT_TIMEOUT'] for wait_timeout
* | | Add a rubocop for Rails.loggerMayra Cabrera2019-07-106-9/+9
| |/ |/| | | | | | | | | Suggests to use a JSON structured log instead Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/54102
* | Copy EE-only config files to CErs-config-parityRobert Speicher2019-07-094-0/+613
| | | | | | | | These aren't used in CE, but it's safe to include them.
* | CE-EE parity for shared config filesRobert Speicher2019-07-093-1/+30
| | | | | | | | | | This copies over EE-specific changes to shared configuration files in CE.
* | Merge branch 'rs-basic-config-files' into 'master'Lin Jen-Shin2019-07-0910-2/+163
|\ \ | | | | | | | | | | | | CE-EE parity for config/initializers See merge request gitlab-org/gitlab-ce!30484
| * | Add frozen_string_literal to EE files now in CErs-basic-config-filesRobert Speicher2019-07-085-0/+10
| | |
| * | Move lib/gitlab dependency to applicationRobert Speicher2019-07-082-2/+1
| | | | | | | | | | | | We use the `Gitlab.ee` and `.ee?` methods in several initializers now.
| * | CE-EE parity for files in config/initializersRobert Speicher2019-07-084-2/+31
| | |
| * | Add EE-only initializersRobert Speicher2019-07-085-0/+123
| |/ | | | | | | | | These files are only used by EE, and are now wrapped in `Gitlab.ee` blocks for file parity.
* | Remove `:graphql` feature flagcharlie ablett2019-07-091-4/+2
| | | | | | | | | | | | | | | | - Remove `FeatureConstrainer` call wrapping api endpoint - Remove `Feature.enabled?(:graphql)` conditionals in back and frontend - Modify graphql test to be graphql flag agnostic - Remove api routing spec - Remove frontend feature flag via `gon`
* | Limit user information to RackAttack throttlesMayra Cabrera2019-07-091-1/+1
|/ | | | | | | | rack.attack.match_discriminator is only return on throttle_authenticated_api or throttle_authenticated_web requests, so we're avoiding logging user_id on blacklist requests Follow up of https://gitlab.com/gitlab-org/gitlab-ce/issues/62756
* Replace runtime isEE check with compile time one60213-fix-is-ee-webpack-checksLukas Eipert2019-07-051-0/+3
| | | | | | | | | This has the benefit that CE bundles will remove dead code in CE only builds. We have a follow-up issue to get rid of this completely: https://gitlab.com/gitlab-org/gitlab-ce/issues/64173
* Merge branch 'fix-sidekiq-transaction-check-race' into 'master'Nick Thomas2019-07-041-6/+7
|\ | | | | | | | | | | | | Fix race in forbid_sidekiq_in_transactions.rb Closes #64088 See merge request gitlab-org/gitlab-ce!30359
| * Fix race in forbid_sidekiq_in_transactions.rbfix-sidekiq-transaction-check-raceKamil Trzciński2019-07-041-6/+7
| | | | | | | | | | | | Current code uses module attribute which stores value global instead of locally (thread locally). This results in concurrent accesses to overwrite the each other values
* | Merge branch 'mj/config-readme-diff' into 'master'Achilleas Pipinellis2019-07-041-2/+1
|\ \ | | | | | | | | | | | | Remove empty lines in config/README.md See merge request gitlab-org/gitlab-ce!30346
| * | Remove empty lines in config/README.mdmj/config-readme-diffMarin Jankovski2019-07-041-2/+1
| |/
* | Change 'Todo' to 'To Do'Christie Lenneville2019-07-041-4/+4
|/ | | | | | | | | | | | | | | | Currently, we label items to be done as "Todo." This is grammatically incorrect and (therefore) confusing—especially to our Spanish-speaking users for whom "todo" has a specific and unrelated meaning. We should use "To Do" and always use it as singular (not "To Dos"). Updates to wording in a few places per MR (ee) discussion Updating locale/gitlab.pot Updates to wording in a few places per MR (ee) discussion Updating locale/gitlab.pot
* Only save Peek session in Redis when Peek is enabledRémy Coutable2019-07-031-0/+3
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2019-07-0314-47/+231
|\
| * Merge branch ↵Kamil Trzciński2019-07-021-4/+16
| |\ | | | | | | | | | | | | | | | | | | | | | | | | '63869-store-prometheus-metrics-in-separate-dirs-in-test-and-prod' into 'master' Use separate Prometheus metrics dirs in dev/test Closes #63869 See merge request gitlab-org/gitlab-ce!30253
| | * Use separate Prometheus metrics dirs in dev/test63869-store-prometheus-metrics-in-separate-dirs-in-test-and-prodAleksei Lipniagov2019-07-021-4/+16
| | | | | | | | | | | | | | | Store Sidekiq and Web server metrics from Prometheus in separate directories in `development` and `test` environments.
| * | Include user id and username in auth logMayra Cabrera2019-07-021-2/+12
| | | | | | | | | | | | | | | | | | Fetches user based on the value of 'rack.attack.match_discriminator' Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62756
| * | Start UnicornSampler in master processJan Provaznik2019-07-021-6/+4
| |/ | | | | | | | | Using `on_master_start` assures that the sampler is started in master process and not in worker processes.
| * Includes logic to persist namespace statisticsMayra Cabrera2019-07-022-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add two new ActiveRecord models: - RootNamespaceStoragestatistics will persist root namespace statistics - NamespaceAggregationSchedule will save information when a new update to the namespace statistics needs to be scheduled - Inject into UpdateProjectStatistics concern a new callback that will call an async job to insert a new row onto NamespaceAggregationSchedule table - When a new row is inserted a new job is scheduled. This job will update call an specific service to update the statistics and after that it will delete thee aggregated scheduled row - The RefresherServices makes heavy use of arel to build composable queries to update Namespace::RootStorageStatistics attributes. - Add an extra worker to traverse pending rows on NAmespace::AggregationSchedule table and schedule a worker for each one of this rows. - Add an extra worker to traverse pending rows on NAmespace::AggregationSchedule table and schedule a worker for each one of this rows
| * Add a memory cache local to the thread to reduce Redis loadStan Hu2019-07-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Loading `ApplicationSetting` from Redis was responsible for at least 50% of the CPU load of the Redis cluster on GitLab.com. Since these values generally don't change very much, we can load this from the database and cache it in memory, skipping Redis altogther. We use `ActiveSupport::Cache::MemoryStore` as a drop-in replacement for `RedisCacheStore` even though we probably don't need synchronized access within `Thread.current`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63977
| * Run do_master_restart callback on server startJan Provaznik2019-07-013-8/+39
| | | | | | | | | | | | | | | | | | | | We want to call master_restart callback on start too - this callback is used for cleaning up prometheus files. It has been added to Omnibus already: https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/3350 So make sure that Unicorn example configs are up-to-date and that the same callback is called for Puma too.
| * Merge branch '62722-boot-app-in-ci-and-check-memory-ce' into 'master'Kamil Trzciński2019-07-011-1/+1
| |\ | | | | | | | | | | | | | | | | | | Get memory data after booting app in production Closes #62722 See merge request gitlab-org/gitlab-ce!30185
| | * Get memory data after booting app in production62722-boot-app-in-ci-and-check-memory-ceAleksei Lipniagov2019-06-281-1/+1
| | | | | | | | | | | | | | | | | | Preload the app in `production` env, hit it with a single request, and gather total gem memory consumption data using `derailed exec perf:mem` from `derailed_benchmarks`. Present the result as MR metrics.
| * | Merge branch 'zj-circuit-breaker-removal-part-deux' into 'master'Bob Van Landuyt2019-07-011-15/+6
| |\ \ | | | | | | | | | | | | | | | | Remove ignored circuit_breaker columns See merge request gitlab-org/gitlab-ce!30159
| | * | Remove ignored circuit_breaker columnsZeger-Jan van de Weg2019-06-281-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | The circuit breaker itself got removed a while ago, when that happened some parts got left behind. Using grep old stale settings and validations were found and are now removed.
| * | | Merge branch 'id-stale-branches' into 'master'Grzegorz Bizon2019-07-011-1/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Add endpoint for fetching diverging commit counts See merge request gitlab-org/gitlab-ce!29802
| | * | | Add endpoint for fetching diverging commit countsid-stale-branchesIgor Drozdov2019-06-281-1/+4
| | | | | | | | | | | | | | | | | | | | Extract diverging_commit_counts into a service class
| * | | | Merge branch 'rs-config-settings' into 'master'Lin Jen-Shin2019-06-291-8/+136
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Copy Settings initializer from EE See merge request gitlab-org/gitlab-ce!30140
| | * | | Move mirror settings to their own EE blockrs-config-settingsRobert Speicher2019-06-281-3/+6
| | | | |
| | * | | Copy Settings initializer from EERobert Speicher2019-06-271-8/+133
| | | |/ | | |/| | | | | | | | | This brings parity between the two versions.
| * | | Revert "Merge branch '62722-boot-app-in-ci-and-check-memory' into 'master'"Rémy Coutable2019-06-281-1/+1
| | | | | | | | | | | | This reverts merge request !30031
| * | | Merge branch 'transaction-metrics' into 'master'Lin Jen-Shin2019-06-281-0/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Monitor database transaction activity for Rails See merge request gitlab-org/gitlab-ce!29928
| | * | | Adds metrics to measure database transactionstransaction-metricsAndrew Newdigate2019-06-281-0/+3
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we don't have good insight into the affect of Rails transaction blocks on the application. If these blocks are held open for extended periods, they can have detrimental effects on the application. This change will allow us to track these transactions, with the aim of reducing their duration.
| * | | Replace 'JIRA' with 'Jira'Takuya Noguchi2019-06-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | https://community.atlassian.com/t5/Jira-questions/Is-it-quot-JIRA-quot-or-quot-Jira-quot/qaq-p/681163 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
| * | | Get memory data after booting app in production62722-boot-app-in-ci-and-check-memoryAleksei Lipniagov2019-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Preload the app in `production` env, hit it with a single request, and gather total gem memory consumption data using `derailed exec perf:mem` from `derailed_benchmarks`. Present the result as MR metrics.
| * | | Merge branch 'id-extract-widget-into-different-request' into 'master'Ash McKenzie2019-06-281-0/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Extract MR's widget into a separate request Closes #62723 See merge request gitlab-org/gitlab-ce!29979
| | * | Extract MR's widget into a separate endpointid-extract-widget-into-different-requestIgor Drozdov2019-06-281-0/+1
| | |/ | | | | | | | | | | | | | | | This commits extracts /merge_requests/1.json?serializer=widget Into a separate /merge_requests/1/widget.json endpoint This will allow to use caching for this request