summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add issue template for query performancedocs-ab/database-query-performance-issue-templateAndreas Brandl2019-09-041-0/+41
| | | | | Relates to https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/7743#note_212379866
* Merge branch 'ab-admin-page-user-active-count' into 'master'Andreas Brandl2019-09-020-0/+0
|\ | | | | | | | | Replace indexes for counting active users See merge request gitlab-org/gitlab-ce!32538
* \ Merge branch 'ab-admin-page-user-active-count' into 'master'Andreas Brandl2019-09-023-2/+31
|\ \ | |/ | | | | | | Replace indexes for counting active users See merge request gitlab-org/gitlab-ce!32538
| * Replace indexes for counting active usersab-admin-page-user-active-countAndreas Brandl2019-09-023-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adjusts the partial condition for an index. The index is intended to be used when counting active users with `ghost IS NOT TRUE AND bot_type IS NULL`. With the current index, this wasn't working as the partial condition didn't match the query: `ghost <> TRUE` is not semantically equivalent to `ghost IS NOT TRUE` (null semantics). The reason we add an index particularly intended for EE is that the EE query is going to have the additional part `AND bot_type IS NULL` whereas the CE query doesn't. Logically, it'd be enough to have an index for `ghost IS NOT TRUE`. However, on GitLab.com, the query planner makes poor choices when the additional `AND bot_type IS NULL` part is present: It goes for the index on `bot_type` and doesn't use the partial index. Note the existing index isn't being used at all according to GitLab.com index statistics. Hence we can first remove it and don't have to worry about the window of time without an index. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/66770
* | Merge branch '66791-handle-different-listen-address-formats' into 'master'Sean McGivern2019-09-023-40/+42
|\ \ | | | | | | | | | | | | Handle :9090 and 0.0.0.0:9090 listen_address formats See merge request gitlab-org/gitlab-ce!32456
| * | Handle :9090 and 0.0.0.0:9090 listen_address formatsReuben Pereira2019-09-023-40/+42
|/ / | | | | | | | | | | Prometheus listen_address can be in formats of :9090 and 0.0.0.0:9090. But before these can be used to connect a project to Prometheus, they have to converted into absolute URIs.
* | Update CHANGELOG.md for 12.2.4GitLab Release Tools Bot2019-09-029-40/+17
| | | | | | [ci skip]
* | Merge branch 'docs/license-compliance' into 'master'Marcia Ramos2019-09-0210-5/+5
|\ \ | | | | | | | | | | | | | | | | | | Update screenshots for License Compliance Closes gitlab-ee#8910 See merge request gitlab-org/gitlab-ce!32537
| * | Update screenshots for License Compliancedocs/license-complianceAchilleas Pipinellis2019-09-0210-5/+5
| |/
* | Merge branch '65152-unfolded-lines-perf-improvement' into 'master'Douwe Maan2019-09-024-7/+38
|\ \ | | | | | | | | | | | | Support selective highlighting of lines See merge request gitlab-org/gitlab-ce!32514
| * | Support selective highlighting of lines65152-unfolded-lines-perf-improvementPatrick Bajao2019-09-024-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of highlighting all lines when not all of them are needed, only highlight from the beginning up to the specified limit. The `BlobPresenter#highlight` method has been updated to support `to` param. This param will be used to limit the content to be highlighted.
* | | Merge branch 'docs-maven-repo-cli-credentials' into 'master'Achilleas Pipinellis2019-09-021-0/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added example for passing Maven repo credentials Closes gitlab-ee#6711 See merge request gitlab-org/gitlab-ce!32073
| * | | Added example for passing Maven repo credentialsMatt Penna2019-09-021-0/+15
|/ / /
* | | Merge branch 'docs-james-gill-contribution' into 'master'Achilleas Pipinellis2019-09-021-26/+23
|\ \ \ | | | | | | | | | | | | | | | | Docs james gill contribution See merge request gitlab-org/gitlab-ce!32520
| * | | Docs james gill contributionMarcel Amirault2019-09-021-26/+23
|/ / /
* | | Merge branch 'pl-fix-chat-notification-service' into 'master'Stan Hu2019-09-021-6/+13
|\ \ \ | |_|/ |/| | | | | | | | CE: Reduce amount of property definitions in ChatNotificationService See merge request gitlab-org/gitlab-ce!32363
| * | Reduce amount of property definitions in ChatNotificationServicePeter Leitzen2019-09-021-6/+13
|/ / | | | | | | | | | | | | Before this commit we redefined properties for supported events on each new instance of ChatNotificationService during "runtime". This commit defines the properties only once during "compile time".
* | Merge branch '66803-fix-uploads-relative-link-filter' into 'master'Grzegorz Bizon2019-09-024-101/+44
|\ \ | | | | | | | | | | | | Fix permissions check in `RelativeLinkFilter` See merge request gitlab-org/gitlab-ce!32448
| * | Fix upload URLs in Markdown66803-fix-uploads-relative-link-filterHeinrich Lee Yu2019-09-024-101/+44
| | | | | | | | | | | | | | | Fixes RelativeLinkFilter for users that don't have access to the project's repository
* | | Merge branch 'qa/e2e-test-custom-email' into 'master'66360-zoom-for-incident-management-integrationRémy Coutable2019-09-025-4/+13
|\ \ \ | | | | | | | | | | | | | | | | Update views for testability and update page objects See merge request gitlab-org/gitlab-ce!32451
| * | | Improve tests speedqa/e2e-test-custom-emailWalmyr Lima2019-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | Before this change, by default the expand button would only be clicked after 10 seconds, but now it will only wait for 1 sec.
| * | | Update page object with new element and methodWalmyr Lima2019-08-301-0/+9
| | | |
| * | | Update views for testabilityWalmyr Lima2019-08-303-3/+3
| | | |
* | | | Merge branch 'mdhtr_swagger-ui-ci-page-template' into 'master'Nick Thomas2019-09-022-0/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add CI Pages template to display static OpenAPI specification files in SwaggerUI See merge request gitlab-org/gitlab-ce!31183
| * | | | Remove reference of external examplemdhtr2019-09-022-0/+34
|/ / / / | | | | | | | | | | | | as requested by the reviewer
* | | | Merge branch ↵Nick Thomas2019-09-027-6/+43
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '65389_wrong_format_on_ms_teams_integration_push_events_with_multi_line_commit_messages' into 'master' Fixing #65389 - Wrong format on MS teams integration push events with multi line commit messages Closes #65389 See merge request gitlab-org/gitlab-ce!32180
| * | | | Fixing #65389Massimeddu Cireddu2019-09-027-6/+43
|/ / / / | | | | | | | | | | | | Wrong format on MS Teams integration push events with multi line commit messages
* | | | Merge branch '60561-quick-action-label-first-for-issue' into 'master'Nick Thomas2019-09-023-1/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | quick action label must be first in issue comment Closes #60561 See merge request gitlab-org/gitlab-ce!32367
| * | | | quick action label must be first in issue commentManeschi Romain2019-09-023-1/+23
|/ / / /
* | | | Merge branch '14756-move-shared-examples' into 'master'Grzegorz Bizon2019-09-022-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename shared examples according to our guidelines Closes gitlab-ee#14316 See merge request gitlab-org/gitlab-ce!32526
| * | | | Rename shared examples according to our guidelines14756-move-shared-examplesRémy Coutable2019-09-022-0/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'winh-ci-lint-javascript-report' into 'master'Kushal Pandya2019-09-022-21/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Remove lint:javascript:report job See merge request gitlab-org/gitlab-ce!32462
| * | | | Remove lint:javascript:report jobWinnie Hellmann2019-09-022-21/+1
|/ / / /
* | | | Merge branch 'fix-peek-on-puma' into 'master'Rémy Coutable2019-09-0215-52/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Peek on Puma Closes #66528 See merge request gitlab-org/gitlab-ce!32213
| * | | | Use gitlab-peek forked gemfix-peek-on-pumaSean McGivern2019-08-282-10/+5
| | | | |
| * | | | Make performance bar enabled checks consistentSean McGivern2019-08-2812-45/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we called the `peek_enabled?` method like so: prepend_before_action :set_peek_request_id, if: :peek_enabled? Now we don't have a `set_peek_request_id` method, so we don't need that line. However, the `peek_enabled?` part had a side-effect: it would also populate the request store cache for whether the performance bar was enabled for the current request or not. This commit makes that side-effect explicit, and replaces all uses of `peek_enabled?` with the more explicit `Gitlab::PerformanceBar.enabled_for_request?`. There is one spec that still sets `SafeRequestStore[:peek_enabled]` directly, because it is contrasting behaviour with and without a request store enabled. The upshot is: 1. We still set the value in one place. We make it more explicit that that's what we're doing. 2. Reading that value uses a consistent method so it's easier to find in future.
| * | | | Fix Peek on PumaSean McGivern2019-08-276-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Peek's `Peek.request_id` method doesn't work well with a multi-threaded server and concurrent requests, because requests can 'steal' another request's ID, or unset it before it was due. The upstream change resolves this; the commit here is just to ensure that GitLab works with that upstream change, mostly by not using `Peek.request_id` any more (as the method doesn't exist).
* | | | | Merge branch '50013-add-browser-platform-flags-sign-in-pages' into 'master'Filipa Lacerda2019-09-023-2/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add CSS & JS global flags to represent browser and platform on login pages See merge request gitlab-org/gitlab-ce!32521
| * | | | | Add browser and platform flagsKushal Pandya2019-09-023-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adds CSS classes to represent browser & platform - Adds JS flags to `gl` object to represent browser & platform
* | | | | | Merge branch '65304-add-pages-first-deployment-message' into 'master'Filipa Lacerda2019-09-024-1/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Improve pages load wait time experience" Closes #65304 See merge request gitlab-org/gitlab-ce!32122
| * | | | | | Add warning about Pages initial deployment delay65304-add-pages-first-deployment-messageNathan Friend2019-08-304-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a warning message that is always displayed that informs users that their GitLab Pages sites will take a bit of time before they can be accessed after being deployed for the first time.
* | | | | | | Merge branch 'sh-mermaid-8.2.6' into 'master'Filipa Lacerda2019-09-023-5/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Mermaid to v8.2.6 See merge request gitlab-org/gitlab-ce!32502
| * | | | | | | Update Mermaid to v8.2.6sh-mermaid-8.2.6Stan Hu2019-09-013-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression where an underscore in labels no longer worked: https://github.com/knsv/mermaid/releases
* | | | | | | | Merge branch 'docs-geo-extra-space' into 'master'Achilleas Pipinellis2019-09-021-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix space in geo doc See merge request gitlab-org/gitlab-ce!32522
| * | | | | | | | Fix space in geo docMarcel Amirault2019-09-021-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/edit-gitlab-pages-domains' into 'master'Achilleas Pipinellis2019-09-021-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify new note for GitLab Pages See merge request gitlab-org/gitlab-ce!32443
| * | | | | | | | Clarify new note for GitLab PagesEvan Read2019-09-021-1/+2
|/ / / / / / / /
* | | | | | | | Merge branch ↵Stan Hu2019-09-021-4/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '14634-broken-master-ee-spec-services-slash_commands-global_slack_handler_spec-rb-ce' into 'master' Resolve "Broken master: ee/spec/services/slash_commands/global_slack_handler_spec.rb" Closes #14634 See merge request gitlab-org/gitlab-ce!32518
| * | | | | | | | Tidy up conditional messagecharlieablett2019-09-021-5/+7
| | | | | | | | |
| * | | | | | | | Handle projectless `help` commands to chatopscharlieablett2019-09-021-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Pass in a nil project to Gitlab::SlashCommands::ApplicationHelp.new if the chatops command is help. - Modify the Gitlab::SlashCommands::Presenters::Help message to skip printing out project information.