summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 'master'12-2-stable-patch-1Stan Hu2019-08-231-1/+1
| | | | | Reduce dedup calls to gc only See merge request gitlab-org/gitlab-ce!32083
* Merge branch 'sh-revert-redis-cache-store' into 'master'Mayra Cabrera2019-08-232-4/+6
| | | | | | | | | | | Fix "ERR value is not an integer or out of range" errors Closes #66449 See merge request gitlab-org/gitlab-ce!32126 (cherry picked from commit 8832aa9522476d9d244211856f4ac7fe545a0c97) 6bda359b Fix "ERR value is not an integer or out of range" errors
* Merge branch 'tr-param-undefined-fix' into 'master'Clement Ho2019-08-233-2/+27
| | | | | | | | | | | | | | | | Embed metrics undefined param fix Closes #66177 See merge request gitlab-org/gitlab-ce!31975 (cherry picked from commit 04b37e429466c9ec750936067c0a9c326e57a1c4) 1ebc87e9 Remove dashboard param when undefined 8122a21a Insert additional assertion 2c4e17f9 Ensure all params have the option to be dropped when falsy 3812e4f3 Use isNil check 5ed2c263 Add tests and null check 2ebe1715 Add change log entry
* Merge branch 'docs/clarify-new-values' into 'master'Achilleas Pipinellis2019-08-231-2/+5
| | | | | | | | | Clarify when new values are valid See merge request gitlab-org/gitlab-ce!31951 (cherry picked from commit 47c069ccba568f407ec605ea033adfc48fe5943b) 1efa52be Clarify when new values are valid
* Merge branch 'sh-fix-issues-api-gitaly-nplusone' into 'master'Sean McGivern2019-08-237-5/+26
| | | | | | | | | | | Fix Gitaly N+1 calls with listing issues/MRs via API Closes #66202 See merge request gitlab-org/gitlab-ce!31938 (cherry picked from commit 57ec78d53066cf9184859a0202609eb01567eab9) ba7c501f Fix Gitaly N+1 calls with listing issues/MRs via API
* Merge branch 'docs-userid-ff' into 'master'Evan Read2019-08-232-1/+14
| | | | | | | | | | | Add Documentation for Feature Flag Target Users Closes gitlab-ee#11459 See merge request gitlab-org/gitlab-ce!31918 (cherry picked from commit 69df059405f720cdb8ae8bcdf348dbafa5d1d64e) c42f5bbc Add documentation for feature flag Target Users
* Merge branch '62971-embed-specific-metrics-chart-in-issue-docs' into 'master'Achilleas Pipinellis2019-08-232-0/+4
| | | | | | | | | | | | | | | | | Embed specific metrics chart in issue docs See merge request gitlab-org/gitlab-ce!31900 (cherry picked from commit aed489bf901745ced6618e680913d0d213998923) 482642b0 Adds specific metric styles and prop 146243da Updated styles, removed css :D 0a5d49f7 Adds docs for embedding chart 4bbb0ddf Simpler null checks 758a195b Fix some wrapping issues d6550ad4 Fix lint and prop type 675639cc Remove everything that isn't docs eb27d0f1 Apply suggestion to doc/user/project/integrations/prometheus.md 364e7219 Compress generate_link_to_chart.png image
* Merge branch 'docs-66076-expansion-options' into 'master'Evan Read2019-08-232-0/+9
| | | | | | | | | | Add documentation for incrementally expand mr diffs See merge request gitlab-org/gitlab-ce!31878 (cherry picked from commit 0a16c8e1964a169363597630ae3cda1ffb8f2b83) c867db91 Add documentation for incrementally expand mr diffs e9d917c2 Apply suggestion to doc/user/project/merge_requests/index.md
* Merge branch ↵Achilleas Pipinellis2019-08-232-0/+6
| | | | | | | | | | | | | | | '64950-move-download-csv-button-functionality-in-metrics-dashboard-cards-into-the-dropdown' into 'master' Add docs for csv download Closes #66291 See merge request gitlab-org/gitlab-ce!31870 (cherry picked from commit 8b0acc31281d7a2feabf4d7dfd4055b10b8184cd) 40327645 Adds docs for downloading csv 11f959ad Compress download_as_csv.png image 5cf5a52f Merge remote-tracking branch 'origin/master' into...
* Merge branch 'docs-update-design-management-limitations' into 'master'Evan Read2019-08-231-2/+12
| | | | | | | | | Link more issues in Design Management Limitations See merge request gitlab-org/gitlab-ce!31697 (cherry picked from commit e40abf9757683c222f724d0f10fbc03475b1b51d) 50956e5c Link more issues in Design Management Limitations
* Merge branch 'docs/license-compliance' into 'master'Achilleas Pipinellis2019-08-2310-39/+39
| | | | | | | | | | | Rename License Management to License Compliance Closes #63329 See merge request gitlab-org/gitlab-ce!31590 (cherry picked from commit 11fd6bdf9972a9a890beb58ba48ebf2afe7d993c) 80b05132 Rename License Management to License Compliance
* Merge branch '65705-two-buttons' into 'master'Kushal Pandya2019-08-231-0/+5
| | | | | | | | | | | Removes duplicate button from job log page Closes #65705 See merge request gitlab-org/gitlab-ce!31544 (cherry picked from commit af2edf28259ff1c236af346cfa6c62092afe7391) 8bed16ee Removes duplicate button
* Update VERSION to 12.2.0v12.2.0GitLab Release Tools Bot2019-08-211-1/+1
|
* Update CHANGELOG.md for 12.2.0GitLab Release Tools Bot2019-08-21217-1088/+240
| | | [ci skip]
* Update VERSION to 12.2.0-rc32v12.2.0-rc32GitLab Release Tools Bot2019-08-211-1/+1
|
* Merge branch 'qa-backport-fix-remaining-prepend-lines' into 'master'Rémy Coutable2019-08-218-13/+97
| | | | | | | | | | | Update qa/Dockerfile to be built from the project root context See merge request gitlab-org/gitlab-ce!31533 (cherry picked from commit 4d4e88df01554336daf245a68653b80ca00989a5) 6aa215aa Support X_if_ee methods for QA tests b601cfcf Update qa/Dockerfile to be built from the project root context 9a4dcd8d Update the 'build-qa-image' job to be built from project root context
* Update VERSION to 12.2.0-rc31v12.2.0-rc3112-2-stable-prepare-rc32GitLab Release Tools Bot2019-08-201-1/+1
|
* Merge commit 'cb60449102dbc129794a8fb3d9535b1ea70d739b' into ↵12-2-stable-prepare-rc31Marin Jankovski2019-08-1935-363/+327
|\ | | | | | | 12-2-auto-deploy-20190818
| * Merge branch 'docs/migrate-cycle-analytics' into 'master'Achilleas Pipinellis2019-08-195-187/+218
| |\ | | | | | | | | | | | | Migrate cycle analytics topic to new section See merge request gitlab-org/gitlab-ce!31827
| | * Migrate cycle analytics topic to new sectionEvan Read2019-08-195-187/+218
| |/ | | | | | | | | Also fixes links to new section and refactors some existing content for the GitLab 12.2 changes.
| * Merge branch 'sh-fix-pipelines-not-being-created' into 'master'Nick Thomas2019-08-194-9/+33
| |\ | | | | | | | | | | | | | | | | | | Fix pipelines not always being created after a push Closes #66196 See merge request gitlab-org/gitlab-ce!31927
| | * Fix pipelines not always being created after a pushsh-fix-pipelines-not-being-createdStan Hu2019-08-174-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31741 introduced a regression where not all the right parameters would be passed into `Ci::CreatePipelineService`. We fix this by breaking out the pipeline parameters and reusing a method from `Gitlab::DataBuilder::Push`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66196
| * | Merge branch 'docs-update-jira-service-page-screenshot' into 'master'64749-usage-quota-button-for-subgroup-leads-to-404Evan Read2019-08-193-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Update docs jira service page screenshot Closes #64778 See merge request gitlab-org/gitlab-ce!31911
| | * | Update doc/user/project/integrations/jira.md, ↵Kemais Ehlers2019-08-193-1/+1
| |/ / | | | | | | | | | | | | | | | doc/user/project/integrations/img/jira_service_page_v12_2.png files Deleted doc/user/project/integrations/img/jira_service_page.png
| * | Merge branch 'docs-quick-actions-formatting-issue-2019-08' into 'master'Evan Read2019-08-191-8/+10
| |\ \ | | | | | | | | | | | | | | | | Escape vertical bars inside code blocks in quick_actions.md See merge request gitlab-org/gitlab-ce!31556
| | * | Escape vertical bars inside code blocks in quick_actions.md - Markdown ↵Jonathan Love2019-08-191-8/+10
| |/ / | | | | | | | | | parsing in previews and Gitlab.com appear to parse these as table delimiters even when inside a code block.
| * | Merge branch 'docs-discussions-image-tweak' into 'master'Evan Read2019-08-192-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Update screenshot to fix bad html Closes #63920 See merge request gitlab-org/gitlab-ce!31889
| | * | Update screenshot to fix bad htmlMarcel Amirault2019-08-192-0/+0
| |/ /
| * | Merge branch 'docs-runner-needs-owner' into 'master'Evan Read2019-08-191-4/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix required runner permissions Closes #52513 See merge request gitlab-org/gitlab-ce!31598
| | * | Fix required runner permissionsdocs-runner-needs-ownerElliot Rushton2019-08-081-4/+4
| | | |
| * | | Merge branch 'docs-resolve-65097' into 'master'Evan Read2019-08-191-8/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Improve clarity of SCIM workflow Closes #65097 See merge request gitlab-org/gitlab-ce!31881
| | * | | Docs: Improve clarity of SCIM workflowTristan Williams2019-08-191-8/+7
| |/ / /
| * | | Merge branch 'qa-quarantine-templates-test' into 'master'Mark Lapierre2019-08-191-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Quarantine failing test See merge request gitlab-org/gitlab-ce!31943
| | * | | Quarantine failing testqa-quarantine-templates-testMark Lapierre2019-08-191-1/+2
| | | |/ | | |/|
| * | | Merge branch 'ee-12980-address-blocking-mr-docs-review' into 'master'Evan Read2019-08-194-15/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve docs for cross-project MR dependencies Closes gitlab-ee#12980 See merge request gitlab-org/gitlab-ce!31904
| | * | | Improve docs for cross-project MR dependenciesNick Thomas2019-08-194-15/+15
| |/ / / | | | | | | | | | | | | Addressing a documentation review by Marcia!
| * | | Merge branch 'docs-update-ci-quick-start' into 'master'Evan Read2019-08-194-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Docs: Refresh CI quick start screenshots See merge request gitlab-org/gitlab-ce!31877
| | * | | Docs: Refresh CI quick start screenshotsTristan Williams2019-08-194-0/+0
| |/ / /
| * | | Merge branch 'remove-mysql-from-dev-docs' into 'master'Evan Read2019-08-1910-72/+34
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Remove MySQL references from development docs See merge request gitlab-org/gitlab-ce!31712
| | * | | Remove MySQL references from development docsNick Thomas2019-08-1610-72/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I noticed the doc/development/testing_guide/best_practices.md still referenced the `[run mysql]` tags, etc. They no longer work, so I removed them, then realised I had better clean up the rest of doc/development !
| * | | | Merge branch 'updates-rate-limit-docs' into 'master'Evan Read2019-08-182-3/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Mentions `auth.log` on Rate limit docs See merge request gitlab-org/gitlab-ce!31906
| | * | | | Mentions related log on Rate limit docsMayra Cabrera2019-08-182-3/+9
| |/ / / / | | | | | | | | | | | | | | | Requests over the rate limit are logged into `auth.log`
| * | | | Merge branch 'docs/update-srm-settings' into 'master'Evan Read2019-08-181-64/+19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update srmX configuration description See merge request gitlab-org/gitlab-ce!31142
| | * | | | Update srmX configurationdocs/update-srm-settingsSteve Azzopardi2019-08-161-64/+19
| | | | | |
| * | | | | Merge branch 'docs-api-ci-auth' into 'master'Evan Read2019-08-181-1/+10
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | add GitLab CI job token API authentication section See merge request gitlab-org/gitlab-ce!30698
| | * | | | add GitLab CI job token API authentication sectionBen Bodenmiller2019-08-181-1/+10
| |/ / / /
* | | | | Merge branch 'sh-fix-pipelines-not-being-created' into 'master'Nick Thomas2019-08-194-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipelines not always being created after a push Closes #66196 See merge request gitlab-org/gitlab-ce!31927 (cherry picked from commit c7d12e602120bc0ec801b9696c7ac344dda10fc4) b46b9d5e Fix pipelines not always being created after a push
* | | | | Merge branch 'qa-quarantine-templates-test' into 'master'Mark Lapierre2019-08-191-1/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantine failing test See merge request gitlab-org/gitlab-ce!31943 (cherry picked from commit 15085d0327e6472ff749b45b83bbc90ce37333f4) 56dcd45a Quarantine failing test
* | | | Merge branch ↵Paul Slaughter2019-08-1727-23/+278
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '50020-fe-allow-email-notifications-to-be-disabled-for-all-users-of-a-group' into 'master' UI for disabling group/project email notifications Closes #50020 See merge request gitlab-org/gitlab-ce!30961
| * | | | UI for disabling group/project email notificationBrett Walker2019-08-1727-23/+278
|/ / / / | | | | | | | | | | | | | | | | | | | | - Adds UI to configure in group and project settings - Removes notification configuration for users when disabled at group or project level