summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2019-07-032-3/+6
|\ \ \ | |/ / |/| |
| * | Merge branch 'osw-persist-tmp-snippet-uploads' into 'master'Marin Jankovski2019-07-021-2/+2
| |\ \ | | | | | | | | | | | | | | | | Persist tmp snippet uploads at users See merge request gitlab/gitlabhq!3138
| | * | Persist tmp snippet uploadsOswaldo Ferreira2019-06-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It persist temporary personal snippets under user/:id namespaces temporarily while creating a upload record to track it. If an user gets removed while it's still a tmp upload, it also gets removed. If the tmp upload is sent, the upload gets moved to personal_snippets/:id as before. The upload record also gets updated to the new model type as well.
| * | | Merge branch 'security-prevent-detection-of-merge-request-template-name' ↵Marin Jankovski2019-07-021-1/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Guests can know whether merge request template name exists or not See merge request gitlab/gitlabhq!3117
| | * | | Authorize access before serving project templateLuke Duncalfe2019-06-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if a user was a guest member of a private project, they could access the merge request template as we were not checking permission-levels of the user. When a issue template is asked for, the user must have :read_issue for the project; or :read_merge_request when a merge request template is asked for. We also now rescue_from FileNotFoundError and handle as 404. This is because RepoTemplateFinder can raise a FileNotFoundError exception, which Rails previously handled as a 500. Handling these in a way that is consistent with ActiveRecord::RecordNotFound exceptions, within controllers that inherit from Projects::ApplicationController at least, and returning a 404. https://gitlab.com/gitlab-org/gitlab-ce/issues/54943
* | | | | Merge branch 'rs-ee-only-routes-2' into 'master'Lin Jen-Shin2019-06-276-7/+167
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE-EE parity for routes See merge request gitlab-org/gitlab-ce!29994
| * | | | | Delineate additional EE-only routesrs-ee-only-routes-2Robert Speicher2019-06-262-16/+29
| | | | | |
| * | | | | Copy routes from EERobert Speicher2019-06-266-7/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures all routes are defined in both CE and EE, with EE-specific routes being wrapped in `Gitlab.ee` blocks.
* | | | | | Merge branch '53811-issue-boards-to-core-projects-backend-ce' into 'master'Stan Hu2019-06-271-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Multiple Issue Boards for Projects to Core See merge request gitlab-org/gitlab-ce!29757
| * | | | | | Move Multiple Issue Boards for Projects to Core53811-issue-boards-to-core-projects-backend-ceAlexandru Croitor2019-06-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor code to allow multiple issue boards management for projects in CE
* | | | | | | Merge branch 'dz-remove-deprecated-user-routes' into 'master'Mike Greiling2019-06-272-10/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Remove deprecated user routes See merge request gitlab-org/gitlab-ce!30044
| * | | | | | Remove deprecated /u/:username routesdz-remove-deprecated-user-routesDmitriy Zaporozhets2019-06-262-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also release `u` from TOP_LEVEL_ROUTES Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'refactor/remove-sentry-from-app-settings' into 'master'Stan Hu2019-06-261-10/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Remove Sentry settings from application settings See merge request gitlab-org/gitlab-ce!28447
| * | | | | | refactor: remove Sentry from application settingsRoger Meier2019-06-251-10/+3
| | |/ / / / | |/| | | |
* | | | | | Speed up obtaining Let's Encrypt certificatesVladimir Shushlin2019-06-261-1/+1
|/ / / / /
* | | | | Copy inflections from EErs-ee-inflectionsRobert Speicher2019-06-251-0/+8
| |_|_|/ |/| | |
* | | | 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-242-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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 'bw-issue-reorder' into 'master'Kamil Trzciński2019-06-211-0/+1
|\ \ \ | | | | | | | | | | | | | | | | Add ability to reorder issues See merge request gitlab-org/gitlab-ce!29012
| * | | Add reorder action to Project IssuesControllerbw-issue-reorderBrett Walker2019-06-211-0/+1
| | | | | | | | | | | | | | | | to support manual sorting on the frontend