summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Final removal of KubernetesService39217-remove-kubernetes-service-integrationTiger2019-08-0815-402/+23
| | | | | | Creating new records has been disabled, and all existing records been migrated to clusters as of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28534
* Merge branch 'sh-add-missing-csp-report-uri' into 'master'Mayra Cabrera2019-08-073-2/+9
|\ | | | | | | | | Add missing report-uri to CSP config See merge request gitlab-org/gitlab-ce!31593
| * Add missing report-uri to CSP configsh-add-missing-csp-report-uriStan Hu2019-08-073-2/+9
| | | | | | | | | | This is supported in Rails 5.2, although it may be deprecated in the future by reports-to.
* | Merge branch 'clair-checksum' into 'master'Stan Hu2019-08-071-0/+2
|\ \ | | | | | | | | | | | | Checksum clair executable See merge request gitlab-org/gitlab-ce!31423
| * | Checksum clair executablePhilippe Lafoucrière2019-08-071-0/+2
|/ /
* | Merge branch '44496-save-project-id' into 'master'Stan Hu2019-08-0710-52/+233
|\ \ | | | | | | | | | | | | Save instance administration project id in DB See merge request gitlab-org/gitlab-ce!31111
| * | Save instance administration project id in DBReuben Pereira2019-08-0710-52/+233
|/ / | | | | | | | | - This will make it easy to identify the project even if admins change the name of the project or move it.
* | Merge branch 'gitaly-version-v1.57.0' into 'master'Sean McGivern2019-08-072-1/+6
|\ \ | | | | | | | | | | | | Upgrade Gitaly to v1.57.0 See merge request gitlab-org/gitlab-ce!31568
| * | Upgrade Gitaly to v1.57.0GitalyBot2019-08-072-1/+6
|/ /
* | 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