summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Replace redirect_from with disqus_identifier in docsdocs/disqus-identifierAchilleas Pipinellis2019-08-087-8/+8
| | | | | | Let's use disqus_identifier since this is a more descriptive name. We will need redirect_from for another purpose anyway (Nanoc redirects).
* Merge branch 'docs-update-feature-flags' into 'master'Achilleas Pipinellis2019-08-073-2/+60
|\ | | | | | | | | | | | | Add Documentation for Feature Flag Percent Rollout Closes gitlab-ee#8240 See merge request gitlab-org/gitlab-ce!29770
| * Update documentation for new feature flag percent rollout UXJason Goodman2019-08-073-2/+60
|/ | | | Add updated screen shots
* Merge branch 'jenkins-quickstart-docs' into 'master'Achilleas Pipinellis2019-08-073-0/+211
|\ | | | | | | | | Add Jenkins quick reference page See merge request gitlab-org/gitlab-ce!31518
| * Add Jenkins quick reference pageJason Lenny2019-08-073-0/+211
|/
* Merge branch 'specific-embeds-be' into 'master'Sean McGivern2019-08-0723-55/+917
|\ | | | | | | | | Support dashboard params for metrics dashboard endpoint See merge request gitlab-org/gitlab-ce!31063
| * Support dashboard params for metrics dashboardSarah Yasonik2019-08-0723-55/+917
|/ | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/62971 Adds support to EnvironmentsController#metrics_dashboard for the following params: group, title, y_label These params are used to uniquely identify a panel on the metrics dashboard. Metrics are stored in several places, so this adds utilities to find a specific panel from the database or filesystem depending on the metric specified. Also moves some shared utilities into separate classes, notably default values and errors.
* Merge branch '45619-reservedNames-docs' into 'master'Achilleas Pipinellis2019-08-071-21/+3
|\ | | | | | | | | | | | | Docs: Update and sort reserved names Closes #45619 See merge request gitlab-org/gitlab-ce!31569
| * Update and sort reserved namesStefan Schmalzhaf2019-08-071-21/+3
| |
* | Merge branch '61445-prevent-persisting-auto-switch-discussion-filter' into ↵Clement Ho2019-08-078-11/+65
|\ \ | | | | | | | | | | | | | | | | | | 'master' Do not persist notes filter when auto-switching See merge request gitlab-org/gitlab-ce!31229
| * | Do not persist notes filter when auto-switchingHeinrich Lee Yu2019-08-078-11/+65
|/ / | | | | | | | | | | Send a `persist_filter: false` param to backend when opening links to notes and auto-switching to show all notes
* | Merge branch '65705-two-buttons' into 'master'Kushal Pandya2019-08-073-2/+13
|\ \ | | | | | | | | | | | | | | | | | | Removes duplicate button from job log page Closes #65705 See merge request gitlab-org/gitlab-ce!31544
| * | Removes duplicate button65705-two-buttonsFilipa Lacerda2019-08-063-2/+13
| | | | | | | | | | | | | | | Prevents manual action button from being rendered twice in the job log empty state
* | | Merge branch '60449-reduce-gitaly-calls-when-rendering-commits-in-md' into ↵Douwe Maan2019-08-075-21/+48
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Lessen Gitaly N+1 errors in markdown processing Closes #60449 See merge request gitlab-org/gitlab-ce!31037
| * | | Initial commit of WIP code for considerationKerri Miller2019-08-075-21/+48
|/ / / | | | | | | | | | Squash this commit and reword before merging..
* | | Merge branch '47814-search-view-labels' into 'master'Paul Slaughter2019-08-0712-44/+139
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Selected project in the search view is not fully readable" Closes #47814 See merge request gitlab-org/gitlab-ce!31137
| * | | Limiting search-field styling to search only47814-search-view-labelsDenys Mishunov2019-08-074-34/+49
| | | | | | | | | | | | | | | | | | | | | | | | - Re-organising search.scss - Rely more on utility-classes instead of component classes - Update relevant specs
| * | | Increasing width of filter dropdownsMarcel van Remmerden2019-08-071-6/+11
| | | |
| * | | Updated Search JS handler to not use defaultLabelDenys Mishunov2019-08-072-6/+5
| | | | | | | | | | | | | | | | - Changelog entry
| * | | Properly labelling fields on Search pageDenys Mishunov2019-08-076-19/+54
| | | | | | | | | | | | | | | | | | | | Adding proper <label>s while removing labels from the fields themselves. This gives more space for the field's content
| * | | Replaced breadcrumbs with title on Search pageDenys Mishunov2019-08-073-2/+43
| | | |
* | | | Merge branch 'zj-bump-git-2.22' into 'master'Douglas Barbosa Alexandre2019-08-075-8/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use Git 2.22 for GitLab See merge request gitlab-org/gitlab-ce!31578
| * | | | Use Git 2.22 for GitLabZeger-Jan van de Weg2019-08-075-8/+8
| | | | | | | | | | | | | | | | | | | | Part of: https://gitlab.com/gitlab-org/gitaly/issues/1715
* | | | | Merge branch ↵Thong Kuah2019-08-073-1/+35
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '13201-rename-snowplow_collector_uri-to-snowplow_collector_hostname' into 'master' Add migration for CE as well Closes #13201 See merge request gitlab-org/gitlab-ce!31405
| * | | | Add migration for CE as well13201-rename-snowplow_collector_uri-to-snowplow_collector_hostnameAlex Buijs2019-08-073-1/+35
| | | | |
* | | | | Merge branch 'andr3-remove-iamphill-sadly' into 'master'Tim Zallmann2019-08-071-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove iamphill from FE Maintainers in codeowners See merge request gitlab-org/gitlab-ce!31484
| * | | | | Remove iamphill from FE Maintainers in codeownersandr3-remove-iamphill-sadlyAndré Luís2019-08-051-2/+2
| | | | | |
* | | | | | Merge branch 'sh-disable-registry-delete' into 'master'Thong Kuah2019-08-073-0/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't attempt to contact registry if it is disabled See merge request gitlab-org/gitlab-ce!31553
| * | | | | | Don't attempt to contact registry if it is disabledsh-disable-registry-deleteStan Hu2019-08-063-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21679 moved the deletion of registry tags outside of a transaction, but introduced an issue where Sidekiq would attempt to contact the container registry during project destruction even if it were disabled. Relates to: * https://gitlab.com/charts/gitlab/issues/1455 * https://gitlab.com/gitlab-org/gitlab-ce/issues/45941
* | | | | | | Merge branch 'docs/compress-images' into 'master'Rémy Coutable2019-08-07232-0/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Compress images with pngquant See merge request gitlab-org/gitlab-ce!31566
| * | | | | | Compress images with pngquantAchilleas Pipinellis2019-08-07232-0/+0
|/ / / / / /
* | | | | | Merge branch 'mc/feature/add-at-colon-variable-masking' into 'master'Grzegorz Bizon2019-08-075-5/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow masking @ and : characters Closes #63043 See merge request gitlab-org/gitlab-ce!31065
| * | | | | | Document new masking requirementsmc/feature/add-at-colon-variable-maskingMatija Čupić2019-07-232-2/+3
| | | | | | |
| * | | | | | Add CHANGELOG entryMatija Čupić2019-07-231-0/+5
| | | | | | |
| * | | | | | Allow masking @ and : charactersMatija Čupić2019-07-233-3/+3
| | | | | | |
* | | | | | | Merge branch 'if-64985-redis_pipelined_in_active_session' into 'master'Thong Kuah2019-08-071-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSession.cleaned_up_lookup_entries to use Redis#pipelined See merge request gitlab-org/gitlab-ce!31096
| * | | | | | | ActiveSession.cleaned_up_lookup_entries to use Redis#pipelinedImre Farkas2019-08-071-2/+4
|/ / / / / / /
* | | | | | | Merge branch 'docs/65499-amend-add-rate-limit-docs' into 'master'Evan Read2019-08-073-18/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65499 Closes #65499 See merge request gitlab-org/gitlab-ce!31458
| * | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65499Russell Dickenson2019-08-073-18/+21
|/ / / / / / /
* | | | | | | Merge branch 'docs/62446-fix-email-nav-path' into 'master'Evan Read2019-08-072-6/+5
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62446 Closes #62446 See merge request gitlab-org/gitlab-ce!31448
| * | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62446Russell Dickenson2019-08-072-6/+5
|/ / / / / /
* | | | | | Merge branch 'docs/4501-docker-in-docker-19-03-service-fails' into 'master'Evan Read2019-08-071-54/+150
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update DinD example for 19.03.1 See merge request gitlab-org/gitlab-ce!31051
| * | | | | | Update DinD example for 19.03docs/4501-docker-in-docker-19-03-service-failsSteve Azzopardi2019-08-061-54/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker 19.03 enables TLS by default: ``` Starting in 18.09+, the dind variants of this image will automatically generate TLS certificates in the directory specified by the DOCKER_TLS_CERTDIR environment variable. Warning: in 18.09, this behavior is disabled by default (for compatibility). If you use --network=host, shared network namespaces (as in Kubernetes pods), or otherwise have network access to the container (including containers started within the dind instance via their gateway interface), this is a potential security issue (which can lead to access to the host system, for example). It is recommended to enable TLS by setting the variable to an appropriate value (-e DOCKER_TLS_CERTDIR=/certs or similar). In 19.03+, this behavior is enabled by default. ``` Update the example to use docker over TLS.
* | | | | | | Merge branch ↵Sean McGivern2019-08-071-1/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33401-follow-up-from-add-prometheus-metrics-endpoint-and-basic-infrastructure-to-meter-code' into 'master' Clean tmpdirs in metrics endpoint specs Closes #33401 See merge request gitlab-org/gitlab-ce!31529
| * | | | | | | Clean tmpdirs in metrics endpoint specsPeter Leitzen2019-08-071-1/+8
|/ / / / / / /
* | | | | | | Merge branch 'docs-fix-assorted-links' into 'master'Evan Read2019-08-0712-18/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix assorted links in the docs See merge request gitlab-org/gitlab-ce!31559
| * | | | | | | Fix assorted linksMarcel Amirault2019-08-0712-18/+15
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Fix links as discovered by the lint in the docs project
* | | | | | | Merge branch 'sh-support-csp-nonce' into 'master'Ash McKenzie2019-08-0717-58/+210
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Content-Security-Policy Closes #65330 See merge request gitlab-org/gitlab-ce!31402
| * | | | | | | Add support for Content-Security-PolicyStan Hu2019-08-0717-58/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A nonce-based Content-Security-Policy thwarts XSS attacks by allowing inline JavaScript to execute if the script nonce matches the header value. Rails 5.2 supports nonce-based Content-Security-Policy headers, so provide configuration to enable this and make it work. To support this, we need to change all `:javascript` HAML filters to the following form: ``` = javascript_tag nonce: true do :plain ... ``` We use `%script` throughout our HAML to store JSON and other text, but since this doesn't execute, browsers don't appear to block this content from being used and require the nonce value to be present.
* | | | | | | | Merge branch '52494-separate-namespace-per-project-environment-slug' into ↵Thong Kuah2019-08-0742-542/+968
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Provide separate namespaces for each project environment See merge request gitlab-org/gitlab-ce!30711