summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Refactor vulnerability modal8146-vuln-modal-refactor-backportPaul Gascou-Vaillancourt2019-08-302-18/+7
| | | | | | | | | | - Moved modal's state into a dedicated module - Moved following actions to modal's module: - openModal - setModalData - openDismissalCommentBox - closeDismissalCommentBox - Created has_vulnerability_modal mixin
* Merge branch '12874-extend-group-ip-restriction-to-command-line-ce-docs' ↵Michael Kozono2019-08-301-1/+1
|\ | | | | | | | | | | | | into 'master' Extend group IP restriction to command line -docs update - backport See merge request gitlab-org/gitlab-ce!32151
| * Update docs fileGosia Ksionek2019-08-301-1/+1
|/ | | | | | | | Add changelod Remove changelog Apply suggestion to doc/user/group/index.md
* Merge branch 'fix-nil-deployable-exception-on-job-controller-show' into 'master'Grzegorz Bizon2019-08-304-1/+23
|\ | | | | | | | | | | | | Fix users cannot access job detail page when deployable does not exist Closes #65216 See merge request gitlab-org/gitlab-ce!32247
| * Fix deployable nil exception on job controllerfix-nil-deployable-exception-on-job-controller-showShinya Maeda2019-08-304-1/+23
| | | | | | | | When deployable is nil, we gracefully take care of the case.
* | Merge branch 'an-fix-histogram-bug' into 'master'12-3-auto-deploy-20190830Kamil Trzciński2019-08-302-2/+2
|\ \ | | | | | | | | | | | | Fix for histogram corruption in Sidekiq See merge request gitlab-org/gitlab-ce!32453
| * | Fix for histogram corruption in SidekiqAndrew Newdigate2019-08-302-2/+2
|/ / | | | | | | | | | | | | This fixes a bug in which sidekiq histograms contain invalid labels. See https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/7729 for more details.
* | Merge branch 'move-ee-ci-config-to-ce' into 'master'Lin Jen-Shin2019-08-302-0/+23
|\ \ | | | | | | | | | | | | Don't use ee/.gitlab/ for CI config files See merge request gitlab-org/gitlab-ce!32351
| * | Don't use ee/.gitlab/ for CI config filesmove-ee-ci-config-to-ceYorick Peterse2019-08-282-0/+23
| | | | | | | | | | | | | | | | | | These files are not available in CE, resulting in CI pipeline failures when trying to include these files. Since the job is already configured to only run on EE, we can just include it in both CE and EE.
* | | Merge branch '12846-update-security-dashboard-docs' into 'master'Achilleas Pipinellis2019-08-303-7/+7
|\ \ \ | | | | | | | | | | | | | | | | Update documentation for security dashboard See merge request gitlab-org/gitlab-ce!32205
| * | | Update documentation for security dashboardDave Pisek2019-08-303-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | This commit updates a screenshot and the description of the documentation of the group security dashboard to it is in sync with the latest version of the dashboard.
* | | | Merge branch 'docs-es-web-indexing' into 'master'Achilleas Pipinellis2019-08-301-123/+176
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Document ES web indexing See merge request gitlab-org/gitlab-ce!31972
| * | | | Document ES web indexingMarkus Koller2019-08-301-123/+176
|/ / / /
* | | | Merge branch 'tr-embed-grafana-image-docs' into 'master'Achilleas Pipinellis2019-08-302-0/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation for embedding Grafana live charts as images Closes #66662 See merge request gitlab-org/gitlab-ce!32342
| * | | | Remove changelog file againTristan Read2019-08-302-0/+21
|/ / / / | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/66684
* | | | Merge branch 'cert_manager_v0_9' into 'master'Kamil Trzciński2019-08-303-11/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Install cert-manager v0.9.1 See merge request gitlab-org/gitlab-ce!32243
| * | | | Install cert-manager v0.9.1James Fargher2019-08-303-11/+54
|/ / / / | | | | | | | | | | | | This does not support upgrading from earlier versions
* | | | Merge branch 'ab-routable-two-step-search' into 'master'Jan Provaznik2019-08-302-3/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Perform two-step Routable lookup by path See merge request gitlab-org/gitlab-ce!32272
| * | | | Add another counter to calculate method call ratioab-routable-two-step-searchAndreas Brandl2019-08-301-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should see the ratio drop down when enabling the Feature. Recommendation by @andrewn
| * | | | Add method call count instrumentationAndreas Brandl2019-08-301-0/+11
| | | | |
| * | | | Perform two-step Routable lookup by pathAndreas Brandl2019-08-302-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to lookup a Project or Namespace by path, we prefer an exact match (case-sensitive) but in absence of that, we'd also take a case-insensitive match. The case-insensitive matching with preference for the exact match is a bit more involved in SQL as the exact lookup. Yet, the majority of cases will be an exact match. The thinking here is that we can optimize the lookup by performing an exact match first and only if there is no result, we perform the case-insensitive lookup. Data for GitLab.com: * We have about 15M records in routes table * About 2,500 routes exist where there's more than one record with the same `lower(path)` It is possible for a user to craft requests that would always trigger the 2-step search (e.g. we have a route for `/foo/bar`, the request is always for `/FOO/bar`). In this case, the change at hand is not beneficial as it would run an additional query. However, based on the data, it is highly likely that the vast majority of requests can be satisfied with an exact match only. The context for this change is https://gitlab.com/gitlab-org/gitlab-ce/issues/64590#note_208156463.
* | | | | Merge branch 'ce-issue_10770' into 'master'Andreas Brandl2019-08-305-2/+41
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Rename epic column state to state_id See merge request gitlab-org/gitlab-ce!32270
| * | | | Rename epic column state to state_idFelipe Artur2019-08-305-2/+41
|/ / / / | | | | | | | | | | | | | | | | Rename epic column state to state_id to be consistent with issues and merge requests
* | | | Merge branch 'docs/add-github-oauth-note' into 'master'Achilleas Pipinellis2019-08-302-38/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add note about GitHub OAuth See merge request gitlab-org/gitlab-ce!32041
| * | | | Add note about GitHub OAuthEvan Read2019-08-302-38/+13
|/ / / /
* | | | Merge branch 'doc_api_settings' into 'master'Achilleas Pipinellis2019-08-301-32/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Settings API: Sync documentation with implemented features See merge request gitlab-org/gitlab-ce!30909
| * \ \ \ Merge branch 'master' into 'doc_api_settings'Achilleas Pipinellis2019-08-30324-1482/+4739
| |\ \ \ \ | | | | | | | | | | | | | | | | | | # Conflicts: # doc/api/settings.md
| * | | | | Apply suggestion to doc/api/settings.mdAchilleas Pipinellis2019-08-291-1/+1
| | | | | |
| * | | | | Settings API: External authentication moved to coreMathieu Parent2019-08-291-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | See #57131.
| * | | | | Settings API: Remove sentry settingsMathieu Parent2019-08-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | See !28447
| * | | | | Settings API: Document undocumented settingsMathieu Parent2019-08-291-1/+12
| | | | | |
| * | | | | Settings API: Document the missing import_sourcesMathieu Parent2019-08-291-1/+2
| | | | | |
| * | | | | Settings API: Sort settingsMathieu Parent2019-08-291-17/+18
| | | | | |
* | | | | | Merge branch '36383-improve-search-result-labels' into 'master'Lin Jen-Shin2019-08-3022-184/+308
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Improve search result labels See merge request gitlab-org/gitlab-ce!32101
| * | | | | Improve search result labelsMarkus Koller2019-08-3022-184/+308
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use "results" instead of "blobs", "wiki blobs", "snippet blobs" - Use "comments" instead of "notes" - Use correct pluralization - Don't add "1 - 10 of" if there's only one page
* | | | | Merge branch '66715-delete-search-animation' into 'master'Paul Slaughter2019-08-302-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delete animation width on global search input Closes #66715 See merge request gitlab-org/gitlab-ce!32399
| * | | | | Delete animation width on global search inputManeschi Romain2019-08-302-2/+6
|/ / / / /
* | | | | Merge branch 'remove-vue-resource-from-remove-issue' into 'master'Kushal Pandya2019-08-302-4/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove vue resource from remove issue See merge request gitlab-org/gitlab-ce!32425
| * | | | | Revert "DB change, migratoin and changelog"Lee Tickett2019-08-302-4/+9
|/ / / / / | | | | | | | | | | | | | | | This reverts commit af5242ecb682189c5d8276e1ab1ffe5ce844f2e5.
* | | | | Merge branch 'renovate/gitlab-packages' into 'master'Kushal Pandya2019-08-302-10/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Packages See merge request gitlab-org/gitlab-ce!32419
| * | | | | Update GitLab PackagesLukas Eipert2019-08-292-10/+10
| | | | | |
* | | | | | Merge branch 'nfriend-add-anchor-tag-to-release-block' into 'master'Kushal Pandya2019-08-302-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `id` attribute to release blocks See merge request gitlab-org/gitlab-ce!32360
| * | | | | | Add id to release blocknfriend-add-anchor-tag-to-release-blockNathan Friend2019-08-282-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds an id attribute to release blocks to allow them to be targeted as anchor links.
* | | | | | | Merge branch 'ce-13479-rename-atmtwps-to-mtwps' into 'master'Paul Slaughter2019-08-303-11/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport for gitlab-org/gitlab-ee!15535: Resolve "Rename `ATMTWPS` to `MTWPS` in code" See merge request gitlab-org/gitlab-ce!32112
| * | | | | | | Rename ATMTWPS to MTWPS (CE)ce-13479-rename-atmtwps-to-mtwpsNathan Friend2019-08-223-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit does a find-and-replace from ATMTWPS -> MTWPS.
* | | | | | | | Merge branch 'docs_api_commits' into 'master'Evan Read2019-08-301-5/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update doc/api/deploy_keys.md See merge request gitlab-org/gitlab-ce!32069
| * | | | | | | | Update doc/api/deploy_keys.mdAlexis Sánchez2019-08-301-5/+8
|/ / / / / / / /
* | | | | | | | Merge branch '66264-moved-issue-reference' into 'master'Jan Provaznik2019-08-305-2/+23
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Use "moved" instead of "closed" in issue references" Closes #66264 See merge request gitlab-org/gitlab-ce!32277
| * | | | | | | Resolve "Use "moved" instead of "closed" in issue references"Juliette de Rancourt2019-08-305-2/+23
|/ / / / / / /
* | | | | | | Merge branch 'patch-76' into 'master'Evan Read2019-08-301-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed grammar and inconsistencies with capitalization See merge request gitlab-org/gitlab-ce!32337