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-01-15Merge branch '11-7-stable' from GitLab.orgYorick Peterse
2019-01-15Merge branch 'security-2770-verify-bundle-import-files-11-7' into ↵Yorick Peterse
'security-11-7' [11.7] Validate bundle files before unpacking them See merge request gitlab/gitlabhq!2773 (cherry picked from commit 3f631ca5d24533e2d90617e1fa0a510268c35b1c) 74f447d1 Validate bundle files before unpacking them
2019-01-15Merge branch '11-7-stable-prepare-rc6' into '11-7-stable'Robert Speicher
Prepare 11.7 RC6 release See merge request gitlab-org/gitlab-ce!24363
2019-01-15Merge branch 'sh-fix-gon-helper-avatar' into 'master'Rémy Coutable
Fix no avatar not showing in user selection box Closes #56268 See merge request gitlab-org/gitlab-ce!24346 (cherry picked from commit 8285205815ccdb25238fcae1c1e91063a46f19b0) 2265ce34 Fix no avatar not showing in user selection box
2019-01-15Merge branch 'jivl-update-placeholder-sentry-config' into 'master'Clement Ho
Update url placeholder for the sentry configuration page Closes #56276 See merge request gitlab-org/gitlab-ce!24338 (cherry picked from commit c4798ba6ef419e94970fd34ac8ea52328bacffaa) ebf772b4 Update url placeholder for the sentry config
2019-01-15Merge branch 'docs-gitaly-tls-version' into 'master'Achilleas Pipinellis
Update Gitaly documentation to indicate which version shipped with Gitaly TLS support See merge request gitlab-org/gitlab-ce!24334 (cherry picked from commit 763c9ddb191c2935e2ea5e9636f1751e4e55cf92) fc75d207 Indicate which version shipped with Gitaly TLS support
2019-01-15Merge branch 'sh-fix-import-export-text-page' into 'master'Robert Speicher
Remove Webhooks from import/export help See merge request gitlab-org/gitlab-ce!24314 (cherry picked from commit 962c8e511084514ce5115b37b0c4fb11e51da84a) 9bbb063f Remove Webhooks from import/export help
2019-01-15Merge branch 'fix-udpate-head-pipeline-method' into 'master'Grzegorz Bizon
Fix unexpected exception by failure of finding an actual head pipeline Closes #56113 See merge request gitlab-org/gitlab-ce!24257 (cherry picked from commit 3ce491c5a065be80856e1f8d5097caba7ea8dd5d) 1c248cd4 Fix unexpected exception by failed to find an actual head pipeline
2019-01-15Merge branch 'osw-fix-quick-suggestion-application-being-reverted' into 'master'Douwe Maan
Adjust applied suggestion reverting previous changes Closes #56017 See merge request gitlab-org/gitlab-ce!24250 (cherry picked from commit 8c1991b9bb7e3b8d606481fdea316d633cfa5eb7) 6e293681 Adjust applied suggestion reverting previous changes
2019-01-15Merge branch 'remove-releases_page-feature-flag' into 'master'Kamil Trzciński
Remove `releases_page` feature flag Closes #56072 See merge request gitlab-org/gitlab-ce!24215 (cherry picked from commit b682a6f8981d303e7ee7ecc4273768ee6ed66864) 9b823af4 Remove releases_page feature flag
2019-01-15Merge branch 'docs-release-asset-link' into 'master'Marcia Ramos
Add documentation for Release Asset Link API Closes #56060 See merge request gitlab-org/gitlab-ce!24211 (cherry picked from commit 6ac5c2d32d2358f8135e922df6b70cb77bb03ef9) 7bd150d1 Add documentation for Release Asset Link API a7657b69 Add cross links 6cefb8d2 Revise release.md that contains wrong description e12f814f Move releases/index.md to the right place 5da21098 Update links which moved by directroy change
2019-01-11Update VERSION to 11.7.0-rc5v11.7.0-rc5GitLab Release Tools Bot
2019-01-11Merge branch '11-7-stable-prepare-rc5' into '11-7-stable'Yorick Peterse
Prepare 11.7 RC5 release See merge request gitlab-org/gitlab-ce!24308
2019-01-11Merge branch 'tc-remove-20181218192239-migration' into 'master'Stan Hu
Remove backfill migration for legacy projects See merge request gitlab-org/gitlab-ce!24299 (cherry picked from commit 626bd9d4cca652f2f21d2aba8d76e1959ffacda0) b87dcc23 Remove backfill migration for legacy projects
2019-01-11Merge branch 'ce-9090-follow_up_on_store_container_scanning_results_in_db' ↵Kamil Trzciński
into 'master' Backport container scanning fixtures See merge request gitlab-org/gitlab-ce!24292 (cherry picked from commit 33d69aaeeebb7126373b107afc42a3d2bfc5ae5a) 9f6f42db Backport container scanning fixtures
2019-01-11Merge branch 'sh-fix-request-profiles-html' into 'master'Sean McGivern
Fix requests profiler in admin page not rendering HTML properly Closes #56152 See merge request gitlab-org/gitlab-ce!24291 (cherry picked from commit 59c0c173b471d50007442c95464df0cac0030fc6) 4ac4ba26 Fix requests profiler in admin page not rendering HTML properly
2019-01-11Merge branch 'sh-fix-real-size-warnings' into 'master'Robert Speicher
Fix broken templated "Too many changes to show" text Closes #56138 See merge request gitlab-org/gitlab-ce!24282 (cherry picked from commit 819de8e8084e1b0cc102664abb8bbc836ff99ede) 488d7d1f Fix broken templated "Too many changes to show" text
2019-01-11Merge branch 'docs-error-tracking' into 'master'Achilleas Pipinellis
Add documentation for Error Tracking Closes #55581 See merge request gitlab-org/gitlab-ce!24275 (cherry picked from commit be855cc6a2b85da2ec3e51e0f767099dc87991e6) 21cc094e Add Error Tracking documentation 7887488c Add link to Error Tracking in operations settings docs 4eb796db Clean up various typos / styling issues
2019-01-11Merge branch 'always-run-cloud-image-trigger' into 'master'Rémy Coutable
Run the cloud-image trigger job for tags, even if the tests fail See merge request gitlab-org/gitlab-ce!24254 (cherry picked from commit 6bd83fabff3bccf0aaa1ab4bcf69421f8bdbd598) 9188c70b Run the cloud-image trigger job for tags, even if the tests fail
2019-01-11Merge branch 'fix-missing-start-discussion-method-qa' into 'master'Ramya Authappan
[CE] port of fix for failing E2E test ee_add_batch_comments_in_merge_request_spec.rb See merge request gitlab-org/gitlab-ce!24247 (cherry picked from commit 7450cdb78429c91c5c839bcc0bd41359472f8649) 9e2cea31 Split reply_to_discussion method
2019-01-11Merge branch 'winh-issue-board-switcher-docs' into 'master'Mike Lewis
Documentation for search box in issue boards switcher See merge request gitlab-org/gitlab-ce!24246 (cherry picked from commit ba5a9033cfefe72897c7e0e13950011a9dee8e80) 7872202c Document search box in issue boards switcher 623db430 Replace issue_boards_multiple.png after adding search box
2019-01-11Merge branch 'fix-qa-auto-devops-secrets' into 'master'Kamil Trzciński
Fix QA spec flaky for application secret variables Closes gitlab-qa#362 See merge request gitlab-org/gitlab-ce!24210 (cherry picked from commit c8ff16642d447f4123d9a83208853108398897ef) e9cb44e5 Fix QA spec flaky for application secret variables
2019-01-11Merge branch 'docs/fix-styleguide' into 'master'Achilleas Pipinellis
Fix broken markdown and other lint problems See merge request gitlab-org/gitlab-ce!24208 (cherry picked from commit b7b7d014f57c64d1324e2230dfecd1953bc47df5) 868d8ec6 Fix broken markdown and other lint problems
2019-01-11Merge branch ↵Annabel Dunstone Gray
'55958-inconsistent-spacing-between-note-and-user-avatar-in-discussions' into 'master' Resolve "Inconsistent spacing between note and user avatar in discussions" Closes #55958 See merge request gitlab-org/gitlab-ce!24197 (cherry picked from commit 81aacf9c6f6c8565638ee340d5df96e2f7d1de53) 2d5c1bd0 Adjust spacing for note header and resolved text c7e902df Use gl-padding-8 as only variable
2019-01-11Merge branch '55945-suggested-change-highlight' into 'master'Phil Hughes
Add syntax highlighting to suggestion diff Closes #55945 See merge request gitlab-org/gitlab-ce!24156 (cherry picked from commit da3b20f7a4cbcbf1698b995f6dc69fa388bc5b2f) 2635f2c6 Add syntax highlighting to suggestion diff e3919efd Add unit test for syntax highlighting 95f2d284 Add changelog entry
2019-01-11Merge branch 'docs-kubernetes-api-40473' into 'master'Evan Read
Adds API project cluster documentation See merge request gitlab-org/gitlab-ce!24135 (cherry picked from commit 27c32f9fa84d7d9876adc648ae443b75a403f4a6) bb384004 Adds project cluster documentation
2019-01-11Merge branch 'docs/gpg-mention-push-rules' into 'master'Achilleas Pipinellis
Clean up the GPG docs and mention push rules Closes #42363 See merge request gitlab-org/gitlab-ce!24046 (cherry picked from commit bdc1ebd0c3a5d0b0639ae7f896c43b8ba3b8759e) e64df98e Clean up the GPG docs and mention push rules
2019-01-10Update VERSION to 11.7.0-rc4v11.7.0-rc4GitLab Release Tools Bot
2019-01-10Merge branch 'sh-bump-carrierwave-1.3.1' into 'master'Robert Speicher
Bump CarrierWave to 1.3.1 Closes #56096 See merge request gitlab-org/gitlab-ce!24280
2019-01-09Update VERSION to 11.7.0-rc3v11.7.0-rc3GitLab Release Tools Bot
2019-01-09Merge branch '11-7-stable-prepare-rc3' into '11-7-stable'Robert Speicher
Prepare 11.7 RC3 release See merge request gitlab-org/gitlab-ce!24241
2019-01-09Merge branch 'sh-revert-mr-23135' into 'master'Robert Speicher
Revert "Merge branch '3062-improve-project-cache' into 'master'" Closes #56103 See merge request gitlab-org/gitlab-ce!24244 (cherry picked from commit a0aca3ac3a4ef56429104c27cd03ce00dcaeafce) e884795e Revert "Merge branch '3062-improve-project-cache' into 'master'"
2019-01-09Merge branch ↵Robert Speicher
'56093-11-7-rc2-prevents-people-from-merging-merge-requests-even-when-they-should-be-able-to' into 'master' Fix MR sidebar to correctly warning if assignee can't merge Closes #56093 See merge request gitlab-org/gitlab-ce!24243 (cherry picked from commit 71026ffd7e71da726a9b740d42093926f8477c3e) 76895008 Fix MR sidebar to correctly warning if assignee can't merge 469678b0 Remove CHANGELOG entry
2019-01-09Merge branch '56076-releases-margin' into 'master'Phil Hughes
Fixes missing margin in releases block Closes #56076 See merge request gitlab-org/gitlab-ce!24229 (cherry picked from commit fa5c4ef2641fe7b55dd63bbe0d99e58fec9944e3) f03313e9 Fixes missing margin in releases block
2019-01-09Merge branch ↵Robert Speicher
'50224-rails5-duplicate-key-value-violates-unique-constraint-index_gpg_signatures_on_commit_sha' into 'master' Resolve "[Rails5] duplicate key value violates unique constraint "index_gpg_signatures_on_commit_sha"" Closes #50224 See merge request gitlab-org/gitlab-ce!24226 (cherry picked from commit abe4e325a20435b6cb1ce6d6ba1a8dcd0a82ea14) df5b7a66 Wait for requests in LFS files spec
2019-01-08Merge branch 'master' into 11-7-stableRobert Speicher
2019-01-08Merge branch 'ce-5606-issues-and-mr-autocomplete-in-epics' into 'master'Robert Speicher
CE backport of gitlab-ee!8936 See merge request gitlab-org/gitlab-ce!23976
2019-01-08Merge branch 'patch-37' into 'master'Evan Read
Link highlighting of jon.doe@example.com swallowed the trailing backtick, destroying formatting. See merge request gitlab-org/gitlab-ce!24133
2019-01-08Link highlighting of jon.doe@example.com swallowed the trailing backtick, ↵Adam Smith
destroying formatting.
2019-01-08Merge branch ↵Mike Lewis
'29951-support-new-issue-creation-by-email-without-subaddressing-docs' into 'master' Document new incoming email address format See merge request gitlab-org/gitlab-ce!23991
2019-01-08Document new incoming email address formatBrett Walker
2019-01-08Merge branch '53966-hashed-storage-read-only' into 'master'Douglas Barbosa Alexandre
Hashed Storage: Only set as `read_only` when starting the per-project migration See merge request gitlab-org/gitlab-ce!24128
2019-01-08Merge branch 'doc-merge_base' into 'master'Evan Read
Fix doc for "Allow getting the merge base of multiple revisions" See merge request gitlab-org/gitlab-ce!24051
2019-01-08Merge branch '49231-import-issues-csv' into 'master'Douwe Maan
Import issues from CSV Closes #49231 See merge request gitlab-org/gitlab-ce!23532
2019-01-08Only set as `read_only` when starting the per-project migrationGabriel Mazetto
In the previous code, we locked the project during the migration scheduling step, which works fine for small setups, but can be problematic in really big installations. We now moved the logic to inside the worker, so we minimize the time a project will be read-only. We also make sure we only do that if reference counter is `0` (no current operation is in progress).
2019-01-08Merge branch 'fix-qa-auto-devops-before-all' into 'master'Kamil Trzciński
Fix QA spec sharing project in the wrong context Closes gitlab-org/quality/nightly#54 See merge request gitlab-org/gitlab-ce!24183
2019-01-07Auto Devops -> Auto DevOpsThong Kuah
2019-01-07Merge branch 'gt-externalize-app-views-shared-notes' into 'master'Fatih Acet
Externalize strings from `/app/views/shared/notes` See merge request gitlab-org/gitlab-ce!23696
2019-01-07Externalize strings from `/app/views/shared/notes`George Tsiolis
2019-01-07Update VERSION to 11.7.0-rc2v11.7.0-rc2GitLab Release Tools Bot