summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Add additional paths to clean from backtracesh-backtrace-clean-sidekiqStan Hu2019-07-311-0/+3
| | | | | `Gitlab::Profiler` can also be used to profile Sidekiq jobs. Add some call traces that can be omitted from the backtrace.
* Merge branch 'add-project-scope-to-live-trace-feature-flag' into 'master'Lin Jen-Shin2019-07-311-1/+1
|\ | | | | | | | | Add project scope to live trace feature flag See merge request gitlab-org/gitlab-ce!31325
| * Add project scope to live trace feature flagadd-project-scope-to-live-trace-feature-flagShinya Maeda2019-07-311-1/+1
| | | | | | | | Add project scope
* | Merge branch 'fix-sidekiq-memory-killer-warn-message' into 'master'Stan Hu2019-07-311-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix sidekiq memory killer warning message Closes gitlab-com/gl-infra/infrastructure#7371 See merge request gitlab-org/gitlab-ce!31264
| * | Fix sidekiq memory killer warning messagefix-sidekiq-memory-killer-warn-messageShinya Maeda2019-07-301-1/+1
| | |
* | | Adds Sidekiq scheduling latency structured logging fieldAndrew Newdigate2019-07-311-0/+6
| | |
* | | Default dependency job stage index to Infinity, and correctly report it as ↵drew2019-07-311-1/+3
| | | | | | | | | | | | undefined in prior stages
* | | Allow knative do be uninstalled:João Cunha2019-07-312-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - After uninstalling the knative helm chart it's necessary to also remove some leftover resources to allow the cluster to be clean and knative to be reinstalleable. - Adds knative uninstall disclaimer - Uninstall ksvc before uninstalling knative Make list of Knative and Ingres resources explicit - To avoid deleting unwanted resources we are listing exact which resources will be deleted rather than simply deleting any resource that contains istio or knative words.
* | | Merge branch '65317-adapt-tae-role-name-change' into 'master'Sean McGivern2019-07-311-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Fix Danger finding a test reviewer Closes #65317 See merge request gitlab-org/gitlab-ce!31292
| * | Update regular expression to extract stage nameLin Jen-Shin2019-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since now the role name can be: "<a href=\"/job-families/engineering/test-automation-engineer/\">Senior Test Automation Engineer</a>, Create:Source Code" We need to cope with </a> in the middle.
* | | Merge branch 'sh-fix-gitaly-access-control' into 'master'Douglas Barbosa Alexandre2019-07-301-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix exception handling in Gitaly autodetection Closes #65328 See merge request gitlab-org/gitlab-ce!31285
| * | Fix exception handling in Gitaly autodetectionStan Hu2019-07-301-1/+1
| |/ | | | | | | | | | | | | In SELinux, the file cannot be written, and `Errno::EACCES`, not `Errno::ACCESS` is thrown. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65328
* | Fix broken update_project_templates rake taskHordur Freyr Yngvason2019-07-301-3/+7
|/ | | | | | This rake task had been broken for a while. This fixes the breakages, adds a test to help avoid future breakages, and adds a few ergonomic improvements to the task itself.
* Merge branch ↵Robert Speicher2019-07-291-0/+4
|\ | | | | | | | | | | | | | | | | '63547-add-system-notes-for-when-a-zoom-call-was-added-removed-from-an-issue' into 'master' Resolve "Add system notes for when a zoom call was added/removed from an issue" Closes #63547 See merge request gitlab-org/gitlab-ce!30857
| * Add system notes for when a zoom call was added/removed from an issue63547-add-system-notes-for-when-a-zoom-call-was-added-removed-from-an-issueJacopo2019-07-291-0/+4
| | | | | | | | | | Add a zoom link added / removed system note when a zoom link is being added / removed to the issue description.
* | Move BaseService to Services directorySarah Yasonik2019-07-295-241/+5
| | | | | | | | | | | | | | | | In preparation for embedding specific metrics in issues https://gitlab.com/gitlab-org/gitlab-ce/issues/62971, this commit moves the BaseService for metrics dashboards to a new services subdirectory. This is purely for the sake of organization and maintainability.
* | Make quick action "commands applied" banner more useful🙈 jacopo beschi 🙉2019-07-297-66/+289
| | | | | | | | | | Extends the quick actions "commands applied" banner to show the quick action preview text, but with everything in past tense.
* | Fix broken master because of security mergeFrancisco Javier López2019-07-291-5/+2
| |
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-07-295-5/+101
|\ \
| * | Extract SanitizeNodeLink and apply to WikiLinkFilterKerri Miller2019-07-261-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SanitizationFilter was running before the WikiFilter. Since WikiFilter can modify links, we could see links that _should_ be stopped by SanatizationFilter being rendered on the page. I (kerrizor) had previously addressed the bug in: https://gitlab.com/gitlab-org/gitlab-ee/commit/7bc971915bbeadb950bb0e1f13510bf3038229a4 However, an additional exploit was discovered after that was merged. Working through the issue, we couldn't simply shuffle the order of filters, due to some implicit assumptions about the order of filters, so instead we've extracted the logic that sanitizes a Nokogiri-generated Node object, and applied it to the WikiLinkFilter as well. On moving filters around: Once we start moving around filters, we get cascading failures; fix one, another one crops up. Many of the existing filters in the WikiPipeline chain seem to assume that other filters have already done their work, and thus operate on a "transform anything that's left" basis; WikiFilter, for instance, assumes any link it finds in the markdown should be prepended with the wiki_base_path.. but if it does that, it also turns `href="@user"` into `href="/path/to/wiki/@user"`, which the UserReferenceFilter doesn't see as a user reference it needs to transform into a user profile link. This is true for all the reference filters in the WikiPipeline.
| * | Merge branch 'security-github-ssrf-redirect' into 'master'GitLab Release Tools Bot2019-07-263-3/+26
| |\ \ | | | | | | | | | | | | | | | | 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-053-3/+26
| | | |
| * | | Merge branch 'security-dns-ssrf-bypass' into 'master'GitLab Release Tools Bot2019-07-261-2/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Server Side Request Forgery mitigation bypass Closes #2872 See merge request gitlab/gitlabhq!3205
| | * | | Fix Server Side Request Forgery mitigation bypassFrancisco Javier López2019-07-151-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we can't resolve the hostname or it is invalid, we shouldn't even perform the request. This fix also fixes the problem the SSRF rebinding attack. We can't stub feature flags outside example blocks. Nevertheless, there are some actions that calls the UrlBlocker, that are performed outside example blocks, ie: `set` instruction. That's why we have to use some signalign mechanism outside the scope of the specs.
* | | | | Merge branch 'remove-peek-pg' into 'master'Stan Hu2019-07-291-45/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-45/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge branch 'ab-remove-postgresql-switches' into 'master'Nick Thomas2019-07-2912-127/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Further remove `if postgresql?` branches Closes #65054 See merge request gitlab-org/gitlab-ce!31102
| * | | | | | Further remove code branches by database typeAndreas Brandl2019-07-2912-127/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We dropped MySQL support and a lot of mysql specific code has been removed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/29608. This comes in from the other direction and removes any `if postgresql?` branches.
* | | | | | | Adds direct monitoring for sidekiq metricsRyan Cobb2019-07-291-0/+48
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This adds diirect monitoring for sidekiq metrics. This is done via sidekiq middleware and a sampler to pull from sidekiqs api.
* | | | | | Added navbar searches usage ping counterFrancisco Javier López2019-07-292-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added usage ping counter when the user makes a search through the navbar search component.
* | | | | | Add Job specific variablesMatija Čupić2019-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds Job specific variables to facilitate specifying variables when running manual jobs.
* | | | | | Merge branch '19186-redirect-wiki-git-route-to-wiki' into 'master'Stan Hu2019-07-261-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/19186
* | | | | | | Merge branch 'remove-nested-groups-checks' into 'master'Lin Jen-Shin2019-07-264-177/+121
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove code related to object hierarchy and MySQL Closes #65056 and #65055 See merge request gitlab-org/gitlab-ce!31095
| * | | | | | | Remove code related to object hierarchy in MySQLremove-nested-groups-checksHeinrich Lee Yu2019-07-254-177/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are not required because MySQL is not supported anymore
* | | | | | | | Merge branch 'mc/feature/find-all-artifacts-for-sha' into 'master'Robert Speicher2019-07-261-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find build by sha from ref Closes #64534 and #45697 See merge request gitlab-org/gitlab-ce!30843
| * | | | | | | Rename latest_successful to be more explicitMatija Čupić2019-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reword Project#latest_successful_build_for to Project#latest_successful_build_for_ref * Reword Ci::Pipeline#latest_successful_for to Ci::Pipeline#latest_successful_build_for_ref
* | | | | | | | Merge branch 'dm-submodule-links-nil' into 'master'Nick Thomas2019-07-261-3/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error rendering submodules in MR diffs when there is no .gitmodules See merge request gitlab-org/gitlab-ce!31162
| * | | | | | | | Fix error rendering submodules in MR diffs when there is no .gitmodulesdm-submodule-links-nilDouwe Maan2019-07-261-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change, we get a NoMethodError on nil
* | | | | | | | | Prefer `flat_map` over `map` + `flatten`Peter Leitzen2019-07-263-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert several occurrences of `map` + `flatten` to `flat_map` where applicable.
* | | | | | | | | Merge branch 'extract_auto_deploy_into_base_image' into 'master'Dmitriy Zaporozhets2019-07-262-376/+48
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract Auto DevOps deploy functions in a base image Closes #50286 See merge request gitlab-org/gitlab-ce!30404
| * | | | | | | | | Extract deploy functions in a base imageextract_auto_deploy_into_base_imageThong Kuah2019-07-252-376/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image
* | | | | | | | | | Ensure Warden triggers after_authentication callbackImre Farkas2019-07-261-2/+5
| |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By not triggering the callback: - ActiveSession lookup keys are not cleaned - Devise also misses its hook related to session cleanup
* | | | | | | | | Merge branch 'print-sidekiq-class-name-in-memory-killer' into 'master'Stan Hu2019-07-251-7/+16
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Logging sidekiq worker class name in SidekiqMemoryKiller See merge request gitlab-org/gitlab-ce!30996
| * | | | | | | | Logging sidekiq worker class name in SidekiqMemoryKillerprint-sidekiq-class-name-in-memory-killerShinya Maeda2019-07-251-7/+16
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, SidekiqMemoryKiller does not feed worker class name in the json structured logging. This commit extends the json parameter.
* | | | | | | | Merge branch 'frozen_string_spec_support' into 'master'Douwe Maan2019-07-252-3/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add frozen_string_literal to spec/support See merge request gitlab-org/gitlab-ce!31132
| * | | | | | | | Frozen string cannot change encodingfrozen_string_spec_supportThong Kuah2019-07-262-3/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was shown in specs but surely this will be happening in application code as well if this method is passes a frozen string. We were also trying to force_encode a OmniAuth::AuthHash which had the very confusing behaviour of returning nil when it was sent a method that it did not define. Fix that by only force_encoding a String.
* | | | | | | | Merge branch 'label-descr-push-opts' into 'master'Lin Jen-Shin2019-07-251-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support title and desc on merge w/ push option See merge request gitlab-org/gitlab-ce!31068
| * | | | | | | | Support title and desc on merge w/ push optionlabel-descr-push-optsChristian Couder2019-07-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequests::PushOptionsHandlerService has been updated to allow creating and updating merge requests with the `title` and `description` set using git push options. To create a new merge request and set its title and description: git push -u origin -o merge_request.create \ -o merge_request.title="My title" \ -o merge_request.description="My description" To update an existing merge request and set its title and description: git push -u origin -o merge_request.title="My title" \ -o merge_request.description="My description" Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64320
* | | | | | | | | Merge branch '54478-table_exists-not-compatible-with-rails-5-1' into 'master'Douglas Barbosa Alexandre2019-07-251-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "table_exists? not compatible with Rails 5.1" Closes #54478 See merge request gitlab-org/gitlab-ce!30832