summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CE Backport of EE changesqa-restric-access-by-ip-address-spec-ceSanad Liaquat2019-08-276-4/+26
| | | | Add qa selector elements and files from the EE branch
* Merge branch 'qa-backport-fix-remaining-prepend-lines' into 'master'Rémy Coutable2019-08-198-13/+97
|\ | | | | | | | | Update qa/Dockerfile to be built from the project root context See merge request gitlab-org/gitlab-ce!31533
| * Update the 'build-qa-image' job to be built from project root contextqa-backport-fix-remaining-prepend-linesRémy Coutable2019-08-191-1/+1
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Update qa/Dockerfile to be built from the project root contextRémy Coutable2019-08-195-12/+91
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Support X_if_ee methods for QA testsYorick Peterse2019-08-192-0/+5
| | | | | | | | | | For the QA tests to use the new injection methods, we must require the initializer and ensure that the "constantize" method is available.
* | Merge branch ↵Annabel Dunstone Gray2019-08-193-3/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '63905-discussion-expand-collapse-button-is-only-clickable-on-one-side' into 'master' Resolve "Discussion "expand"/"collapse" button is only clickable on one side" Closes #63905 See merge request gitlab-org/gitlab-ce!31730
| * | Make all of the discussion toggle clickable63905-discussion-expand-collapse-button-is-only-clickable-on-one-sideThomas Randolph2019-08-163-3/+7
| | |
* | | Merge branch '65278-cleanup-sidekiq-metrics-dir-on-start' into 'master'Kamil Trzciński2019-08-194-13/+82
|\ \ \ | | | | | | | | | | | | | | | | Clean Sidekiq metrics from multiproc dir on start See merge request gitlab-org/gitlab-ce!31855
| * | | Clean Sidekiq metrics from multiproc dir on startAleksei Lipniagov2019-08-194-13/+82
|/ / / | | | | | | | | | | | | | | | | | | After moving the multiproc dir cleanup into `config.ru`:`warmup`, we stopped cleaning Sidekiq metrics dir which is not correct. This MR intended to fix that. More details: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31668
* | | Merge branch ↵Rémy Coutable2019-08-196-10/+101
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | '64630-add-warning-to-pages-domains-that-obtaining-deploying-ssl-certificates-through-let-s-encrypt-can-take-some-time' into 'master' Resolve "Add warning to pages domains that obtaining/deploying SSL certificates through Let's Encrypt can take some time" See merge request gitlab-org/gitlab-ce!31765
| * | | Add warning when LE certificate can't be obtained64630-add-warning-to-pages-domains-that-obtaining-deploying-ssl-certificates-through-let-s-encrypt-can-take-some-timeVladimir Shushlin2019-08-196-10/+101
| | |/ | |/| | | | | | | * Refactor some tests as well
* | | Merge branch '66192-remove-activerecord-sane-schema-dumper' into 'master'Stan Hu2019-08-192-5/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove active_record_sane_schema_dumper gem Closes #66192 See merge request gitlab-org/gitlab-ce!31963
| * | | Remove active_record_sane_schema_dumper gemHeinrich Lee Yu2019-08-192-5/+0
| |/ / | | | | | | | | | | | | We don't need this since this is already the default behavior of Rails since 5.1
* | | Merge branch 'docs-update-issue_workflow' into 'master'Rémy Coutable2019-08-191-25/+6
|\ \ \ | |/ / |/| | | | | | | | Update Team labels definition in the Issue Workflow documentation See merge request gitlab-org/gitlab-ce!31811
| * | Update Team labels definition in the Issue Workflow documentationRémy Coutable2019-08-191-25/+6
|/ / | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '13076-stage-card-ui-component-ce' into 'master'60537-gitlab-pages-access-control-issues-a-redirect-to-http-even-though-external-url-is-set-to-httpsKushal Pandya2019-08-197-60/+336
|\ \ | | | | | | | | | | | | Stage card ui component See merge request gitlab-org/gitlab-ce!31580
| * | Move cycle analytics stages templates to vueEzekiel Kigbo2019-08-197-60/+336
|/ / | | | | | | | | | | | | | | | | | | The existing stage list items are rendered in haml, migrating them to vuejs for future work. Fix alignment of median value Test for stage_nav_item.vue
* | Merge branch 'cross-link-instrumentation' into 'master'Evan Read2019-08-191-1/+1
|\ \ | | | | | | | | | | | | Link to GitLab Performance Monitoring See merge request gitlab-org/gitlab-ce!31947
| * | Link to GitLab Performance Monitoringcross-link-instrumentationThong Kuah2019-08-191-1/+1
| | |
* | | Merge branch 'docs-patch-72' into 'master'Evan Read2019-08-191-12/+17
|\ \ \ | | | | | | | | | | | | | | | | Improve new CI job permissions model docs See merge request gitlab-org/gitlab-ce!30696
| * | | Improve new CI job permissions model docsBen Bodenmiller2019-08-191-12/+17
|/ / /
* | | Merge branch 'docs-testing-guide-update' into 'master'Evan Read2019-08-191-1/+0
|\ \ \ | | | | | | | | | | | | | | | | Docs fixup: Remove reference to old lib/api/ci dir See merge request gitlab-org/gitlab-ce!31937
| * | | Remove reference to old lib/api/ci dirdocs-testing-guide-updateThong Kuah2019-08-171-1/+0
| | | | | | | | | | | | This directory no longer exists (since 2017)
* | | | Merge branch 'doc-be_like_time' into 'master'Evan Read2019-08-191-0/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add `be_like_time` matcher to Testing Styleguide See merge request gitlab-org/gitlab-ce!31833
| * | | | Add `be_like_time` matcher to Testing Styleguidedoc-be_like_timeLuke Duncalfe2019-08-191-0/+13
| | | | |
* | | | | Merge branch 'docs-update-design-management-limitations' into 'master'Evan Read2019-08-191-2/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Link more issues in Design Management Limitations See merge request gitlab-org/gitlab-ce!31697
| * | | | | Link more issues in Design Management Limitationsdocs-update-design-management-limitationsLuke Duncalfe2019-08-151-2/+12
| |/ / / /
* | | | | Merge branch 'docs-userid-ff' into 'master'Evan Read2019-08-192-1/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Documentation for Feature Flag Target Users Closes gitlab-ee#11459 See merge request gitlab-org/gitlab-ce!31918
| * | | | | Add documentation for feature flag Target UsersJason Goodman2019-08-192-1/+14
|/ / / / / | | | | | | | | | | | | | | | Add screenshot
* | | | | 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