summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update Unicorn Worker recommendationbjk/worker_scale_docBen Kochie2019-08-021-2/+2
| | | | | | | Update the Unicorn worker documentation based on the new scaling formula. https://gitlab.com/gitlab-org/omnibus-gitlab/issues/4535
* Merge branch 'sh-fix-mermaid-subgraphs-docs' into 'master'test-assingingEvan Read2019-08-024-28/+19
|\ | | | | | | | | Use Mermaid Markdown for testing guide docs See merge request gitlab-org/gitlab-ce!31322
| * Use Mermaid Markdown for testing guide docssh-fix-mermaid-subgraphs-docsStan Hu2019-08-014-28/+19
| | | | | | | | | | | | | | * Remove PNGs in favor of dynamically rendered graphs * Eliminate <b> styling because this is no longer supported * Change <br /> to <br> because the latter is only supported * Add quotes around subgraph titles
* | Merge branch 'docs/project-templates-also-on-gitlab-com' into 'master'Achilleas Pipinellis2019-08-021-2/+2
|\ \ | | | | | | | | | | | | Custom project templates also on GitLab.com See merge request gitlab-org/gitlab-ce!31396
| * | Custom project templates also on GitLab.comEvan Read2019-08-021-2/+2
|/ /
* | Merge branch ↵Kushal Pandya2019-08-025-4/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '58256-incorrect-empty-state-message-displayed-on-explore-projects-tab' into 'master' Resolve Incorrect empty state message on "Explore projects" Closes #58256 See merge request gitlab-org/gitlab-ce!25578
| * | Resolve Incorrect empty state message on "Explore projects"Dennis Tang2019-08-025-4/+11
|/ /
* | Merge branch 'georgekoltsov/64501-update-ldap-doc' into 'master'Evan Read2019-08-021-7/+10
|\ \ | | | | | | | | | | | | Update ldap#security section See merge request gitlab-org/gitlab-ce!31335
| * | Update ldap#security sectionGeorge Koltsov2019-08-021-7/+10
|/ /
* | Merge branch 'compat-check-docs-update' into 'master'Lin Jen-Shin2019-08-027-11/+12
|\ \ | | | | | | | | | | | | Exclude docs from ee_compat_check See merge request gitlab-org/gitlab-ce!31397
| * | Update regex for docs branches in ciMarcel Amirault2019-08-027-11/+12
|/ / | | | | | | Changes * to + to be more precise with acceptable branch names
* | Merge branch 'sh-mermaid-subgraph-docs' into 'master'Evan Read2019-08-021-0/+43
|\ \ | | | | | | | | | | | | | | | | | | Document required quotes in Mermaid subgraph titles Closes #65338 See merge request gitlab-org/gitlab-ce!31312
| * | Document required quotes in Mermaid subgraph titlessh-mermaid-subgraph-docsStan Hu2019-07-311-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mermaid v8.2.3 added support for styling in subgraphs, but if there are multiple words in a title, quotes are required. * https://github.com/knsv/mermaid/pull/845 * https://github.com/knsv/mermaid/issues/391#issuecomment-495602059 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65338
* | | Merge branch 'mk/add-rate-limit-docs' into 'master'Evan Read2019-08-028-12/+212
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add rate limit docs Closes #41308 See merge request gitlab-org/gitlab-ce!30829
| * | | Add rate limit docsMichael Kozono2019-08-028-12/+212
|/ / /
* | | Merge branch '59521-job-sidebar-has-a-blank-block' into 'master'Paul Slaughter2019-08-023-5/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove blank block from job sidebar Closes #59521 See merge request gitlab-org/gitlab-ce!30754
| * | | Only render job sidebar block if it has contentMiranda Fluharty2019-08-023-5/+34
|/ / / | | | | | | | | | | | | | | | Change sidebar's renderBlock() to return true only if any of the block's <detail-row>s will be rendered Change block to render only if renderBlock() returns true
* | | Merge branch 'docs/jira_server_create_user' into 'master'Evan Read2019-08-021-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Corrected name of Jira group See merge request gitlab-org/gitlab-ce!31358
| * | | Corrected name of Jira groupRussell Dickenson2019-08-021-2/+2
|/ / /
* | | Merge branch 'patch-72' into 'master'Evan Read2019-08-021-5/+5
|\ \ \ | | | | | | | | | | | | | | | | Update global dashboard shortcuts See merge request gitlab-org/gitlab-ce!31281
| * | | Update global dashboard shortcutsNishad Sohoni2019-08-021-5/+5
|/ / / | | | | | | | | | Needs shift keypress
* | | Merge branch '10646-create-drafts-with-commit-id-ce' into 'master'Paul Slaughter2019-08-029-8/+81
|\ \ \ | | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14520 See merge request gitlab-org/gitlab-ce!30284
| * | | Backport from EE10646-create-drafts-with-commit-id-cejboyson12019-08-012-0/+4
| | | |
| * | | Make diff_refs_match_commit validation reusablePatrick Bajao2019-08-014-7/+64
| | | | | | | | | | | | | | | | | | | | Move it to DiffPositionableNote concern which will be re-used in EE in DraftNote model.
| * | | Add commit_id to draft_notes tablePatrick Bajao2019-08-013-1/+13
| | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14520
* | | | Merge branch 'add-cop-for-rspec-file-paths' into 'master'Ash McKenzie2019-08-0219-66/+150
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add RSpec/TopLevelDescribePath cop See merge request gitlab-org/gitlab-ce!31241
| * | | | Quarantine folder containing only a folder specadd-cop-for-rspec-file-pathsSean McGivern2019-08-011-1/+2
| | | | |
| * | | | Remove snippet breadcrumb specSean McGivern2019-08-011-19/+0
| | | | | | | | | | | | | | | | | | | | We removed the breadcrumbs in 0def36777e3f9e5f57fd0e1ebd023b43229622fc.
| * | | | Fix project nav specsSean McGivern2019-08-011-2/+2
| | | | |
| * | | | Remove mail_google_schema_whitelisting specSean McGivern2019-08-011-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This task was removed in 2014! The spec wasn't, probably because it didn't fail as it was never executed. See 0fc5c80207a1ebcfbdae1d0d16b9aeb984bac271.
| * | | | Fix milestone view specsSean McGivern2019-08-013-2/+3
| | | | |
| * | | | Fix labels issuable link specsSean McGivern2019-08-013-15/+40
| | | | |
| * | | | Rename broken spec filesSean McGivern2019-08-0115-0/+0
| | | | | | | | | | | | | | | | | | | | RSpec only executes files ending in _spec.rb.
| * | | | Add RSpec/TopLevelDescribePath copSean McGivern2019-08-013-0/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RSpec/FilePath cop checks that a spec file's path is correct, but only if the file describes a constant. We want to check, for any file with a top-level `describe`, whether the file path ends in `_spec.rb`. We don't care what comes before that; just that it will be executed by RSpec at all.
* | | | | Merge branch '9928-add-security-approvals-docs' into 'master'Evan Read2019-08-022-0/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for Security Approvals for MRs See merge request gitlab-org/gitlab-ce!30959
| * | | | | Add documentation for Security Approvals for MRsLucas Charles2019-08-022-0/+42
|/ / / / / | | | | | | | | | | | | | | | Documents how to enable security approvals
* | | | | Merge branch 'ce-update-echarts' into 'master'Paul Slaughter2019-08-012-9/+8
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | (CE Port) Remove local echarts dependency See merge request gitlab-org/gitlab-ce!31282
| * | | | Remove local echarts dependencyMartin Wortschack2019-08-012-9/+8
|/ / / / | | | | | | | | | | | | - Update package.json and yarn.lock
* | | | Merge branch 'revert-editor-indents' into 'master'Michael Kozono2019-08-0116-1287/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'mh/editor-indents' into 'master'" See merge request gitlab-org/gitlab-ce!31391
| * | | | Revert "Merge branch 'mh/editor-indents' into 'master'"revert-editor-indentsPaul Slaughter2019-08-0116-1287/+39
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 28f2225bdfee4d353f07a766c6c8b29ba6181397, reversing changes made to 96ae5bd83da31350e9856a290127d7aa1469710a.
* | | | | Merge branch 'ce-docker_image_replication' into 'master'Douglas Barbosa Alexandre2019-08-019-3/+57
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3809 See merge request gitlab-org/gitlab-ce!31375
| * | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3809ce-docker_image_replicationValery Sizov2019-08-019-3/+57
| | | | | | | | | | | | | | | | | | | | Introducing Docker Registry replication
* | | | | Merge branch 'id-user-auto-complete-can-merge' into 'master'Robert Speicher2019-08-014-1/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add can_merge option to autocomplete response See merge request gitlab-org/gitlab-ce!30565
| * | | | | Add can_merge option to autocomplete responseIgor2019-08-014-1/+62
|/ / / / / | | | | | | | | | | | | | | | It's used only if merge_request_iid param is provided
* | | | | Merge branch 'bvl-fix-relative-positioning-rename-ce' into 'master'Robert Speicher2019-08-011-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Skip specs for default relative positions See merge request gitlab-org/gitlab-ce!31390
| * | | | | Skip specs for default relative positionsBob Van Landuyt2019-08-011-1/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | If a model has a default relative position we don't need to test that it is moved to the end, it will instead get the default value assigned.
* | | | | Merge branch '63707-tiller-is-installed-on-a-specific-node-pool-docs' into ↵Rémy Coutable2019-08-011-9/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Document the current state of the Review App clusters Closes #63707 See merge request gitlab-org/gitlab-ce!31385
| * | | | | Document the current state of the Review App clustersRémy Coutable2019-08-011-9/+22
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'Stan Hu2019-08-0115-78/+316
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Use NotesFinder to fetch notes on API and Controllers Closes #52123 See merge request gitlab-org/gitlab-ce!31300
| * | | | Change block parameter name to params52123-issuable-actions-notesfinder-pderichsPatrick Derichs2019-08-012-3/+3
| | | | |