Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-08-28Merge branch 'sh-lfs-object-batches' into 'master'Rémy Coutable
Makes LFS object link process OIDs in batches Closes #66274 See merge request gitlab-org/gitlab-ce!32268
2019-08-28Merge branch 'query-recorder-apply-bindings' into 'master'Grzegorz Bizon
Apply bindings to queries from QueryRecorder See merge request gitlab-org/gitlab-ce!31689
2019-08-28Apply bindings to querys from QueryRecorderDavid Wilkins
- local tests that assume certain parameters to queries from QueryRecorder fail. These same tests don't fail in the runners, and I can't tell why. This fixes the local failures
2019-08-28Merge branch 'sh-upgrade-mermaid-8.2.4' into 'master'Filipa Lacerda
Upgrade Mermaid to v8.2.4 See merge request gitlab-org/gitlab-ce!32186
2019-08-28Merge branch '35060-remove-token-field' into 'master'Filipa Lacerda
Remove token field from runners edit form Closes #35060 See merge request gitlab-org/gitlab-ce!32231
2019-08-28Remove token field from runners edit formPayton Burdette
Add changelog entry Remove unnecessary test checking for form value Translations updated for gitlab.pot Use proper format on changelog entry
2019-08-28Merge branch 'id-change-total-notes-calculation' into 'master'Ash McKenzie
Change the way totalNotes is calculated See merge request gitlab-org/gitlab-ce!32191
2019-08-28Merge branch 'sh-fix-issue-move-api' into 'master'Grzegorz Bizon
Fix moving issues API failing when text includes commit URLs Closes #66666 See merge request gitlab-org/gitlab-ce!32317
2019-08-28Fix moving issues API failing when text includes commit URLsStan Hu
When a issue is moved from one project to another, all associated Markdown text is rewritten in the context of the new project. If the note contained a link to a commit URL, `CommitRewriter#rewrite` would fail because `Commit#link_reference_pattern` would match `nil` `commit` values in the HTML generated from the Markdown. These `nil` values were passed along to `Project#commits_by` because `Commit#reference_valid?` was always returning `true`. To prevent this issue from happening, we tighten up the check for `Commit#reference_valid?` to look for valid SHA values. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66666
2019-08-28Merge branch 'user-tracking-settings' into 'master'Jan Provaznik
Adjusts snowplow to use cookies for sessions Closes telemetry#77 See merge request gitlab-org/gitlab-ce!32236
2019-08-28Changes snowplow to use cookies for sessionsJeremy Jackson
This also restructures how and where the configuration for Snowplow lives.
2019-08-28Merge branch 'docs/license-compliance-rename' into 'master'Evan Read
Rename all filenames and occurrences to License Compliance See merge request gitlab-org/gitlab-ce!32148
2019-08-28Rename all filenames and occurrences to License ComplianceAchilleas Pipinellis
- New redirect doc/user/application_security/license_compliance/index.md - Renaming of images. - Some links that were pointing to the old location are fixed.
2019-08-28Merge branch 'docs/unlinking-emails' into 'master'Evan Read
Remove a section for a now fixed bug See merge request gitlab-org/gitlab-ce!32319
2019-08-28Merge branch 'docs/edit-feature-flags' into 'master'Achilleas Pipinellis
Edit Feature Flags topic See merge request gitlab-org/gitlab-ce!31956
2019-08-28Edit Feature Flags topicEvan Read
2019-08-28Remove a section for a now fixed bugAchilleas Pipinellis
Those guidelines where based on https://gitlab.com/gitlab-org/gitlab-docs/issues/311 which seems to be fixed.
2019-08-28Merge branch 'docs-markdownlint-fixes-1' into 'master'Achilleas Pipinellis
Fix markdown in various docs (part 1) See merge request gitlab-org/gitlab-ce!32267
2019-08-28Fix markdown in various docsMarcel Amirault
Clean up issues that may cause the docs-lint test to fail, such as trailing whitespace, no EOF newline, blockquotes, etc
2019-08-28Merge branch 'docs/fix-introduced-in-text' into 'master'Achilleas Pipinellis
Fixes Introduced in text for our renderer See merge request gitlab-org/gitlab-ce!32308
2019-08-28Fixes Introduced in text for our rendererEvan Read
2019-08-28Merge branch 'mk/remove-jwt-from-rate-limit-docs' into 'master'Evan Read
Note CI token exception to JWT requests in rate limit docs See merge request gitlab-org/gitlab-ce!32168
2019-08-28Merge branch 'todos/include-issue-mr-titles' into 'master'Stan Hu
Add Issue and Merge Request titles to Todo items Closes #63488 See merge request gitlab-org/gitlab-ce!30435
2019-08-28Change the way totalNotes is calculatedIgor Drozdov
totalNotes is only used to prerender a number of skeleton containers until real notes are loaded issuable.discussions makes multiple requests, so too expensive for this This commit uses mere notes for this and sends actual totalNotes number if it's less than 10; otherwise it sends 10 - it allows us to avoid bunch of skeleton prerenderings, which are not necessary since they doesn't fit into the whole screen and disappear quite fast
2019-08-28Merge branch 'qa-restric-access-by-ip-address-spec-ce' into 'master'Sanad Liaquat
CE Backport of EE changes See merge request gitlab-org/gitlab-ce!32203
2019-08-28Merge branch 'docs-patch-74' into 'master'Evan Read
Remove eks from adding an existing cluster section See merge request gitlab-org/gitlab-ce!32125
2019-08-28Remove eks from adding an existing cluster sectionDaniel Gruesso
2019-08-28Merge branch 'ss/add-board-name-to-page-title' into 'master'Mike Greiling
Ss/add board name to page title See merge request gitlab-org/gitlab-ce!32074
2019-08-28Ss/add board name to page titleScott Stern
2019-08-28Merge branch 'docs-gitlab-basics-followup' into 'master'Evan Read
Resolving minor formatting issues in gitlab-basics Closes #65307 See merge request gitlab-org/gitlab-ce!32194
2019-08-28Resolving minor formatting issues in gitlab-basicsMarcel Amirault
2019-08-28Merge branch 'ce-refactor-dev-org-com-helper' into 'master'Ash McKenzie
Rename dev, org, com helper See merge request gitlab-org/gitlab-ce!32115
2019-08-28Rename dev, org, com helperDoug Stull
2019-08-28Add Issue and Merge Request titles to Todo itemsArun Kumar Mohan
Only displays the todo body if the todo has a note. This is to avoid redundant Issue or Merge Request titles displayed both in the Todo title and body.
2019-08-28Merge branch '10688-group-maintainers-edit-epic-comments-permissions-docs' ↵Evan Read
into 'master' Update group permissions table documentation See merge request gitlab-org/gitlab-ce!32020
2019-08-28Update group permissions table documentationEugenia Grieff
2019-08-28Merge branch 'docs/66091-change-mattermost-version-reference' into 'master'Evan Read
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66091 Closes #66091 See merge request gitlab-org/gitlab-ce!32188
2019-08-28Change reference to Mattermost versions.Russell Dickenson
Changed reference to Mattermost versions, so that it's clear which menu navigation path applies.
2019-08-28Merge branch 'load-balancing-prometheus' into 'master'Evan Read
Add docs for db_load_balancing metrics See merge request gitlab-org/gitlab-ce!32044
2019-08-28Makes LFS object linker process OIDs in batchesStan Hu
During a project import, `LfsLinkService` attempts to link `LfsObjects` that have not already been associated with a project. It's possible for a large repo to have thousands of OIDs, which can cause long database query and parsing times. By processing a batch of 1000 at a time, we can reduce that time at the expense of a few more SQL queries. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66274
2019-08-28Merge branch 'sh-rate-limits-qa' into 'master'Mark Lapierre
Add QA specs for using IP rate limits See merge request gitlab-org/gitlab-ce!32177
2019-08-28Merge branch 'sh-document-qa-admin-account-docs' into 'master'Mark Lapierre
Document setting admin credentials in QA tests See merge request gitlab-org/gitlab-ce!32271
2019-08-27Merge branch '13353-DesignType-notes_count-ce' into 'master'Mayra Cabrera
CE backport for gitlab-org/gitlab-ee!15433 (Expose DesignType#notes_count in GraphQL) See merge request gitlab-org/gitlab-ce!32037
2019-08-27CE-specific changes for designs `user_notes_count`Luke Duncalfe
Notes call `#after_note_created` and `#after_note_destroyed` on their noteable in callbacks, so the noteable can perform tasks particular to them, like cache expiry. This is in preparation of the EE-specific class `DesignManagement::Design` clearing its `user_notes_count` cache when its note are created or destroyed. Refactoring Rspec behaviour testing of a counter caching service into a shared example. https://gitlab.com/gitlab-org/gitlab-ee/issues/13353
2019-08-27Merge branch 'sh-fix-docs-lint-snippets-docs' into 'master'Mayra Cabrera
Remove trailing whitespace from project snippets API docs Closes #66677 See merge request gitlab-org/gitlab-ce!32298
2019-08-27Remove trailing whitespace from project snippets API docsStan Hu
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66677
2019-08-27Merge branch ↵Clement Ho
'60141-mr-resolve-conflicts-file-headers-bad-positioning-on-scroll' into 'master' Resolve "MR resolve conflicts file headers bad positioning on scroll" Closes #60141 See merge request gitlab-org/gitlab-ce!31991
2019-08-27Round the file title; Add top border to conflict diffsThomas Randolph
The file title sometimes overflows its container, which has the same border-radius. By always rounding the file title, the overflow never happens, so the corners always look correct. Everywhere else there are file diffs, there is a top border to complete the full border around the file.
2019-08-27Merge branch 'fix-nil-error-in-gitlab-danger-teammate' into 'master'Lin Jen-Shin
Fix a nil error in Gitlab::Danger::Teammate See merge request gitlab-org/gitlab-ce!32284
2019-08-27Merge branch 'docs/update-api-snippets' into 'master'Achilleas Pipinellis
Add example requests for snippets API See merge request gitlab-org/gitlab-ce!31964