summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Add methods for injecting EE modulesYorick Peterse2019-07-301-0/+17
| | | | | | | | | | | This adds the methods prepend_if_ee, extend_if_ee, and include_if_ee that can be used to inject EE specific modules in EE. These methods are exposed as an initializer that is loaded as soon as possible. For tests that use fast_spec_helper.rb we must load this initializer manually, as the Rails environment is not loaded. This is not the most pretty setup, but unfortunately there is no alternative that we can use.
* Remove line profiler from performance barSean McGivern2019-07-301-1/+0
| | | | | | | | | 1. The output isn't great. It can be hard to find hotspots and, even when you do find them, to find why those are hotspots. 2. It uses some jQuery-specific frontend code which we can remove now that we don't have this any more. 3. It's only possible to profile the initial request, not any subsequent AJAX requests.
* Merge branch 'sh-add-cmaps-for-pdfjs' into 'master'Mike Greiling2019-07-291-0/+8
|\ | | | | | | | | | | | | Make pdf.js render CJK characters Closes #62152 See merge request gitlab-org/gitlab-ce!31220
| * Make pdf.js render CJK characterssh-add-cmaps-for-pdfjsStan Hu2019-07-281-0/+8
| | | | | | | | | | | | | | | | As mentioned in https://github.com/wojtekmaj/react-pdf/blob/master/README.md, pdf.js needs the bundled cMaps files to work. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62152
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-07-292-5/+2
|\ \
| * \ Merge branch 'security-github-ssrf-redirect' into 'master'GitLab Release Tools Bot2019-07-261-0/+1
| |\ \ | | | | | | | | | | | | | | | | Do not allow localhost url redirection in GitHub Integration See merge request gitlab/gitlabhq!3188
| | * | Do not allow localhost url redirection in GitHub Integrationmanojmj2019-07-051-0/+1
| | | |
| * | | Merge branch 'security-remove-take-trigger-ownership-feature' into 'master'GitLab Release Tools Bot2019-07-261-5/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop feature to take ownership of a trigger token Closes #2868 See merge request gitlab/gitlabhq!3198
| | * | | Drop feature to take ownership of a trigger tokenFabio Pitino2019-07-101-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing API and frontend interactions that allowed users to take ownership of a trigger token. Removed mentions from the documentation.
* | | | | Merge branch 'remove-peek-pg' into 'master'Stan Hu2019-07-291-35/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace peek-pg with our own implementation Closes #44441 See merge request gitlab-org/gitlab-ce!31187
| * | | | | Replace peek-pg with our own implementationremove-peek-pgSean McGivern2019-07-261-35/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uses an ActiveRecord subscriber to get queries and calculate the total query time from that. This means that the total will always be consistent with the queries in the table. It does however mean that we could potentially miss some queries that don't go through ActiveRecord. Making this change also allows us to unify the response JSON a little bit, making the frontend slightly simpler as a result.
* | | | | | Adds direct monitoring for sidekiq metricsRyan Cobb2019-07-291-0/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | This adds diirect monitoring for sidekiq metrics. This is done via sidekiq middleware and a sampler to pull from sidekiqs api.
* | | | | Merge branch '19186-redirect-wiki-git-route-to-wiki' into 'master'Stan Hu2019-07-261-0/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Redirect project.wiki.git to project wiki home See merge request gitlab-org/gitlab-ce!31085
| * | | | | Redirect project.wiki.git to project wiki home19186-redirect-wiki-git-route-to-wikiLuke Duncalfe2019-07-261-0/+12
| |/ / / / | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/19186
* | | | | Updates label value to include units in metricsLaura Montemayor2019-07-262-29/+29
|/ / / / | | | | | | | | | | | | | | | | | | | | This MR updates the y_label values and the label values in common_metrics and cluster_metrics to append the units of measurement to the labels.
* | | | Remove unneeded monkey-patch54478-table_exists-not-compatible-with-rails-5-1Heinrich Lee Yu2019-07-253-12/+2
| | | | | | | | | | | | | | | | | | | | Changes all calls to data_source_exists? to table_exists? since that is the intent of these calls
* | | | Merge branch 'ce-docker_image_replication-event-generation' into 'master'Douglas Barbosa Alexandre2019-07-242-0/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14597 See merge request gitlab-org/gitlab-ce!30520
| * | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14597ce-docker_image_replication-event-generationValery Sizov2019-07-242-0/+10
| | | | | | | | | | | | | | | | | | | | This is the first part of Docker Registry replication for secondary Geo node.
* | | | Add Rugged calls to performance barStan Hu2019-07-231-0/+1
|/ / / | | | | | | | | | | | | | | | This will help diagnose the source of excessive I/O from Rugged calls. To implement this, we need to obtain the full list of arguments sent to each request method.
* | | Merge branch '52442-initial-mysql-support-removal' into 'master'Robert Speicher2019-07-2310-316/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove dead mysql code Closes #63191 See merge request gitlab-org/gitlab-ce!29608
| * | | Remove dead MySQL codeNick Thomas2019-07-2310-316/+32
| | | | | | | | | | | | | | | | None of this code can be reached any more, so it can all be removed
* | | | Merge branch 'sh-remove-opclasses-patch' into 'master'Mayra Cabrera2019-07-231-211/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove PostgreSQL opclasses monkey patch Closes #64529 and #59673 See merge request gitlab-org/gitlab-ce!30709
| * | | | Remove PostgreSQL opclasses monkey patchsh-remove-opclasses-patchStan Hu2019-07-231-211/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is no longer needed with Rails 5.2. opclass is the attribute used per https://github.com/rails/rails/pull/19090/files. Now that we've removed the monkey patch and restored the Rails schema dumper, it appears Rails has dropped the inclusion of `using: :btree` as well (https://github.com/rails/rails/pull/27981). Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64529
* | | | Speed up boot timeSergey Alekseev2019-07-231-5/+1
|/ / / | | | | | | by removing an unused `begin ... rescue ... end` block. The block is no longer necessary after moving the bootsnap gem to the :default group in eedf735574b9f6c7c6c843943dd946ce84238236.
* | | Merge branch 'sh-enable-bootsnap' into 'master'Douglas Barbosa Alexandre2019-07-231-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make Bootsnap available via ENABLE_BOOTSNAP=1 Closes #45230 See merge request gitlab-org/gitlab-ce!30963
| * | | Make Bootsnap available via ENABLE_BOOTSNAP=1Stan Hu2019-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bootsnap speeds up Rails loading and now ships by default with Rails 5.2 apps. We should promote this to a default gem and test it out in production. This will also make it possible for the Helm Charts to take advantage of this. It appears that Bootsnap with Rails 5.2.3 and all the GitLab CE gems loads fine on an ARM platform now, so it's possible that https://gitlab.com/gitlab-org/gitlab-ce/issues/34799 has been resolved. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/45230
* | | | Merge branch 'FixLocaleEN' into 'master'Bob Van Landuyt2019-07-231-6/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove duplicated mapping key in config/locales/en.yml See merge request gitlab-org/gitlab-ce!30980
| * | | | Remove duplicated mapping key in config/locales/en.ymlPeter Dave Hello2019-07-221-6/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "errors" section was defined twice in this file, the first one was the once being removed here, another one is at line 164 (before removal) or line 158 (after removal). The content of duplicated strings definition are totally the same, the second part has more data (41 lines in total, compare to the removed 6 lines), so I removed the first part but not the second part. cc !16710
* | | | Merge branch '6544-remove-scss-diff-ce' into 'master'Phil Hughes2019-07-231-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Resolve difference in app/assets/stylesheets/application.scss See merge request gitlab-org/gitlab-ce!31007
| * | | | Resolve difference in app/assets/stylesheets/application.scss6544-remove-scss-diff-ceLukas Eipert2019-07-221-0/+6
| |/ / /
* | | | Merge branch 'ce-4946-resolve-ee-config' into 'master'Robert Speicher2019-07-221-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Port EE specific settings to CE See merge request gitlab-org/gitlab-ce!30998
| * | | | Port EE specific settings to CELin Jen-Shin2019-07-221-0/+1
| |/ / /
* | | | Fix xterm CSS not loadingMike Greiling2019-07-221-1/+4
|/ / /
* | | Move frontend fixtures into spec/frontendMike Greiling2019-07-191-1/+1
| | | | | | | | | | | | | | | Moves every fixture source file from spec/javascripts to spec/frontend
* | | Move frontend fixtures to tmp/testsMike Greiling2019-07-191-2/+8
| | |
* | | Merge branch 'an-sidekiq-chaos' into 'master'Lin Jen-Shin2019-07-182-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adds chaos endpoints to Sidekiq Closes #64663 See merge request gitlab-org/gitlab-ce!30814
| * | | Adds chaos endpoints to Sidekiqan-sidekiq-chaosAndrew Newdigate2019-07-182-1/+2
| | | | | | | | | | | | | | | | | | | | This allows the chaos endpoints to be invoked in Sidekiq so that this environment can be tested for resilience.
* | | | Merge branch 'bjk/usage_ping' into 'master'Stan Hu2019-07-181-5/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update usage ping cron behavior See merge request gitlab-org/gitlab-ce!30842
| * | | | Update usage ping cron behaviorbjk/usage_pingBen Kochie2019-07-181-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Splay the start by sleeping up to one minute. * Adjust sideikiq retries to try up to approximately three hours. * Randomize the minute fully within the hour. * Psudo-randomize the day of the week based on the instance UUID.
* | | | | Merge branch 'sh-add-rugged-logs' into 'master'Douglas Barbosa Alexandre2019-07-181-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Rugged calls and duration to API and Rails logs Closes #64676 See merge request gitlab-org/gitlab-ce!30871
| * | | | | Add Rugged calls and duration to API and Rails logsStan Hu2019-07-181-0/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds `rugged_duration_ms` and `rugged_calls` fields to `api_json.log` and `production_json.log`. This will make it easier to identify performance issues caused by excessive I/O. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64676
* | | | | Merge branch 'add-profile-mode-to-extend-request-profiling' into 'master'Kamil Trzciński2019-07-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add profile mode to extend request profiling See merge request gitlab-org/gitlab-ce!30126
| * | | | | Add profile mode to extend request profilingadd-profile-mode-to-extend-request-profilingQingyu Zhao2019-07-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the support for "X-Profile-Token: <token>" to have an additional header that defines type of profile we are looking for, like: X-Profile-Mode: execution X-Profile-Mode: memory
* | | | | Fix pid providing for PrometheusAleksei Lipniagov2019-07-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use relative worker identifier for metrics (instead of Process.pid) and identify when Unicorn/Puma/Sidekiq is used. Previously, it was assumed that all metrics are gathered from Unicorn due to hardcoded implementation which was incorrect.
* | | | | Merge branch 'sh-fix-redis-performance-bar' into 'master'Mayra Cabrera2019-07-181-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix inconsistency in Redis performance bar stats Closes #64707 See merge request gitlab-org/gitlab-ce!30866
| * | | | Fix inconsistency in Redis performance bar statssh-fix-redis-performance-barStan Hu2019-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | peek-redis resets its counters at the start of an ActionController notification (`start_processing.action_controller`), which causes it to miss some Redis queries that precede it, such as the database load balancer and Rack Attack queries. This produces inconsistencies in the performance bar between the number of calls and their durations with the actual calls in the detailed view. We fix this by getting rid of peek-redis in favor of consolidating all logic into the `RedisDetailed` view, which tracks Redis queries using `RequestStore`. This has the nice property of removing thread-specific counters as well. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64707
* | | | | Merge branch 'rs-zz-metrics' into 'master'Lin Jen-Shin2019-07-171-0/+31
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Add EE-only class instrumentation See merge request gitlab-org/gitlab-ce!30802
| * | | | Add EE-only class instrumentationrs-zz-metricsRobert Speicher2019-07-161-0/+31
| |/ / /
* | | | Rename Redactor classes to ReferenceRedactorSarah Yasonik2019-07-161-1/+1
| | | |
* | | | Don't use transactions and exceptionsReuben Pereira2019-07-161-0/+13
|/ / / | | | | | | | | | Instead return error objects.
View Lorry Controller Status