summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'bvl-upload-designs-fix-ce' into 'master'Douwe Maan2019-05-012-3/+11
|\ | | | | | | | | Make Gitlab::GlRepository#types an instance method See merge request gitlab-org/gitlab-ce!27902
| * Make Gitlab::GlRepository#types an instance methodBob Van Landuyt2019-04-302-3/+11
| | | | | | | | | | | | | | | | Having this as an instance method makes it easier to override in the prepended `EE` module. If we try to override this method on the module itself, it would not be overridden correctly, depending on the load order.
* | Update metrics dashboard API to load yml from repoSarah Yasonik2019-05-019-47/+231
| | | | | | | | | | | | | | | | | | | | | | Updates the EnvironmentController#metrics_dashboard endpoint to support a "dashboard" param, which can be used to specify the filepath of a dashboard configuration from a project repository. Dashboard configurations are expected to be stored in .gitlab/dashboards/. Updates dashboard post-processing steps to exclude custom metrics, which should only display on the system dashboard.
* | Merge branch 'feat/sentry-environment' into 'master'Douglas Barbosa Alexandre2019-04-301-1/+6
|\ \ | | | | | | | | | | | | 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-301-1/+6
| |/
* | Merge branch 'jc-client-for-fetch-objects-into-pool' into 'master'Stan Hu2019-04-302-0/+13
|\ \ | |/ |/| | | | | Add client methods for FetchIntoObjectPool RPC See merge request gitlab-org/gitlab-ce!27767
| * Add client methods for FetchIntoObjectPool RPCJohn Cai2019-04-302-0/+13
| | | | | | | | | | | | | | Gitaly's FetchIntoObjectPool RPC will idempotently fetch objects into an object pool. If the pool doesn't exist, it will create an empty pool before attempting the fetch. This change adds client code as well as specs to cover this behavior.
* | Merge branch 'pl-fix-k8s-ns-query-variables' into 'master'Grzegorz Bizon2019-04-301-1/+5
|\ \ | | | | | | | | | | | | Use correct k8s namespace in Prometheus queries See merge request gitlab-org/gitlab-ce!27812
| * | Use correct k8s namespace in Prometheus queriesPeter Leitzen2019-04-291-1/+5
| | | | | | | | | | | | | | | Before this commit the wrong namespace could have been used in Prometheus queries for group-level installations.
* | | Docs aren't reviewed using rouletteEvan Read2019-04-301-4/+4
| | |
* | | Teach Helm::Api about #uninstallThong Kuah2019-04-291-0/+7
| | |
* | | Merge branch '6565-move-sidekiq-cluster-ce' into 'master'Robert Speicher2019-04-291-2/+2
|\ \ \ | |_|/ |/| | | | | | | | Change comments to point to the new path of sidekiq-cluster See merge request gitlab-org/gitlab-ce!27707
| * | Change path of bin/sidkiq-cluster in commentsHossein Pursultani2019-04-291-2/+2
| | | | | | | | | | | | | | | `sidekiq-cluster` is moved from `bin/` to `ee/bin` in EE code. This is a corresponding change in CE.
* | | Merge branch 'use-keyword-args-for-databuilder-push' into 'master'Douglas Barbosa Alexandre2019-04-291-2/+10
|\ \ \ | | | | | | | | | | | | | | | | Use keyword args for databuilder push See merge request gitlab-org/gitlab-ce!24088
| * | | Use all keyword args for DataBuilder::Push.build()Jonathon Reinhart2019-04-251-2/+10
| |/ /
* | | Merge remote-tracking branch 'origin/master'John T Skarbek2019-04-2918-10/+501
|\ \ \
| * | | Fix slow performance with compiling HAML templatesStan Hu2019-04-291-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5, including `ActionView::Context` can have a significant and hidden performance penalty because this module also includes `ActionView::CompiledTemplates`. This means that any module that includes ActionView::Context becomes a descendant of `CompiledTemplates`. When a partial is rendered for the first time, it runs `ActionView::CompiledTemplates#module_eval`, which will evaluate a string that defines a new method for that partial. For example, the source of partial might be this string: ``` def _app_views_project_show_html_haml___12345(local_assigns, output) "hello world" end ``` When this string is evaluated, the Ruby interpreter will define the method and clear the global method cache for all descendants of `ActionView::CompiledTemplates`. Previous to this change, we inadvertently made a number of modules fall into this category: * GroupChildEntity * NoteUserEntity * Notify * MergeRequestUserEntity * AnalyticsCommitEntity * CommitEntity * UserEntity * Kaminari::Helpers::Paginator * CurrentUserEntity * ActionView::Base * ActionDispatch::DebugExceptions::DebugView * MarkupHelper * MergeRequestPresenter After this change: * Kaminari::Helpers::Paginator * ActionView::Base * ActionDispatch::DebugExceptions::DebugView Each time a partial is rendered for the first time, all methods for those modules will have to be redefined. This can exact a significant performance penalty. How bad is this penalty? Using the following benchmark script, we can use DTrace to sample the Ruby interpreter: ``` Benchmark.bm do |x| x.report do 1000.times do ActionView::CompiledTemplates.module_eval("def testme\nend") end end end ``` This revealed a 11x jump in the time spent in `core#define_method` alone. Rails 6 fixes this behavior by moving the `include CompiledTemplates` into ActionView::Base so that including `ActionView::Context` doesn't quietly affect other modules in this way. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11198
| * | | Merge branch 'bvl-initialize-design-repo-ce' into 'master'Douwe Maan2019-04-292-1/+11
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Port changes for design management to CE See merge request gitlab-org/gitlab-ce!27555
| | * | Port changes for design management to CEBob Van Landuyt2019-04-292-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | This ports the changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10462/ to CE
| * | | Merge branch 'sh-fix-profiler-ruby-5.1' into 'master'28996-automatic-https-certificate-creation-renewal-for-pages-custom-domains-228996-automatic-https-certificate-creation-renewal-for-pages-custom-domainsSean McGivern2019-04-291-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Profiler to work with Rails 5.1 Closes #61051 See merge request gitlab-org/gitlab-ce!27774
| | * | | Fix Profiler to work with Ruby 5.1Stan Hu2019-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 5.1 now requires keyword arguments to pass along parameters and headers for ActionDispatch::Integration::RequestHelpers. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61051
| * | | | Add gitaly session id & catfile-cache feature flagJohn Cai2019-04-291-1/+7
| | |/ / | |/| |
| * | | Merge branch ↵Kamil Trzciński2019-04-281-5/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60945-masked-variable-still-printed-in-log-output-on-gitlab-com' into 'master' Resolve "Masked Variable still printed in log output on gitlab.com" Closes #60945 See merge request gitlab-org/gitlab-ce!27768
| | * | | Remove variable masking feature flagMatija Čupić2019-04-261-5/+1
| | |/ /
| * | | Merge branch '60383-setup-dashboard-endpoint' into 'master'Grzegorz Bizon2019-04-286-0/+302
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create dashboards endpoint & setup dashboard post-processing Closes #60383 See merge request gitlab-org/gitlab-ce!27405
| | * | | Move dashboard param to initialize method60383-setup-dashboard-endpointsyasonik2019-04-256-18/+17
| | | | |
| | * | | Prefer safe_load and deep_symbolize_keyssyasonik2019-04-252-9/+8
| | | | |
| | * | | Move MetricsDashboard to Metrics::Dashboardsyasonik2019-04-2512-292/+304
| | | | |
| | * | | Defend against dashboard errors, rework sequencesyasonik2019-04-245-9/+46
| | | | |
| | * | | Make EE interactions and transformations cleanersyasonik2019-04-246-23/+29
| | | | |
| | * | | Minor line length cleanupsyasonik2019-04-242-9/+11
| | | | |
| | * | | Bring in line with EE needssyasonik2019-04-247-51/+84
| | | | |
| | * | | Inherit from BaseServicerpereira22019-04-241-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Change MetricsDashboard::Service to inherit from BaseService so that it can reuse methods like initialize, success, error.
| | * | | Minor optimization and code claritysyasonik2019-04-242-16/+16
| | | | |
| | * | | Correct the order of groups and panelsrpereira22019-04-242-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Order groups by descending order of priority. - Order panels by descending order of weight. - Perform sorting after adding project/custom metrics.
| | * | | Fix rubocop failuresrpereira22019-04-243-15/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add 3 functions called find_or_create_panel, find_or_create_panel_group, and find_or_create_metric to avoid having to use 'send'. - Remove an unused variable. - Freeze a constant array.
| | * | | Refactor dashboard proccesing into stagessyasonik2019-04-245-0/+185
| | | | |
| * | | | Add deployment events to chat notification servicesJason Goodman2019-04-262-0/+25
| | |/ / | |/| | | | | | | | | | | | | | This enables sending a chat message to Slack or Mattermost upon a successful, failed, or canceled deployment
| * | | Add ProjectMetricsDashboardSetting model and tableReuben Pereira2019-04-262-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | This new table will be used to store the external_dashboard_url which allows users to add a link to their external dashboards (ex Grafana) to the Metrics dashboard.
| * | | Add ZAP Full Scan support to DAST vendored templateVictor Zagorodny2019-04-261-1/+3
| | | |
| * | | Merge branch '#57351-add-dotnet-core-yaml-template' into 'master'Grzegorz Bizon2019-04-261-0/+107
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Fix #57351 - Add .NET Core YAML template Closes #57351 See merge request gitlab-org/gitlab-ce!25604
| | * | Update .NET Core YAML templatePiotr Wosiek2019-04-261-11/+10
| | | | | | | | | | | | | | | | Improve indent for cache paths
| | * | Update .NET Core YAML template - improve indentPiotr Wosiek2019-04-251-47/+38
| | | | | | | | | | | | | | | | Improve indent and remove empty lines
| | * | Update .NET Core YAML template - improve cachingPiotr Wosiek2019-03-221-27/+22
| | | | | | | | | | | | | | | | Revise logic of dependency caching, add cache key, make before script global.
| | * | Update .NET Core YAML template - add cachePiotr Wosiek2019-03-201-22/+77
| | | | | | | | | | | | | | | | Update the template showing how to cache restored dependencies, add few variables, reduce before_script part, add and improve descriptions.
| | * | Make the testing section more genericPiotr Wosiek2019-03-131-6/+8
| | | |
| | * | Remove the diagram of project directories structurePiotr Wosiek2019-03-131-10/+0
| | | |
| | * | Improve note about building not .NET Core based projectsPiotr Wosiek2019-03-131-5/+5
| | | |
| | * | Add .NET Core YAML templatePiotr Wosiek2019-02-271-0/+75
| | | |
* | | | Merge branch 'secure-disallow-read-user-scope-to-read-project-events' into ↵GitLab Release Tools Bot2019-04-294-47/+63
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 'master' Disallow read user scope to read project events See merge request gitlab/gitlabhq!3067