summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Edit contribution analytics for SSOTdocs/ssot_group_contribution_analyticsRussell Dickenson2019-06-061-21/+43
|
* Merge branch 'docs-its-relative-6' into 'master'Evan Read2019-06-0521-87/+74
|\ | | | | | | | | Docs: Update all links to relative in /workflow and /administration See merge request gitlab-org/gitlab-ce!28971
| * Docs: Update all links to relative in /workflow and /administrationMarcel Amirault2019-06-0521-87/+74
|/
* Merge branch 'ce-mw-onboarding-tour-skeleton' into 'master'Mayra Cabrera2019-06-053-6/+16
|\ | | | | | | | | (CE Port) New user onboarding (Skeleton) See merge request gitlab-org/gitlab-ce!28753
| * Add render_projects method to controllerMartin Wortschack2019-06-053-6/+16
|/ | | | - Render EE specific partial if exists
* Merge branch 'docs/ssot-installation-guides' into 'master'Mike Lewis2019-06-0417-239/+256
|\ | | | | | | | | | | | | SSoT - Clean up docs under install/ Closes #61509 See merge request gitlab-org/gitlab-ce!28688
| * Clean up docs under install/docs/ssot-installation-guidesAchilleas Pipinellis2019-06-0317-239/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an initiative to ensure all documentation complies completely with the Documentation Style Guide section "Documentation is the single source of truth (SSOT)" according to this epic https://gitlab.com/groups/gitlab-org/-/epics/1280. In particular, the changes of this commit touch all files under doc/install/. Most notably: - install/redis.md: Redirect to Redis section of install guide. - install/pivotal/index.md: Changed its content to reflect the current status, which is no longer supported (since 2017!). - install/google-protobuf.md: Incorporated inside installation.md under the troubleshooting section. - install/openshift_and_gitlab.md: Clarified that this guide is no longer relevant. We might want to redirect to the Chart docs in the future. - install/structure.md: Incorporated inside installation.md under its own section. - install/kubernetes/index.md: Redirected to https://docs.gitlab.com/charts
* | Merge branch 'sast-catch-unexpected-token' into 'master'Robert Speicher2019-06-041-1/+1
|\ \ | | | | | | | | | | | | Fix `SyntaxError: Unexpected token` in SAST jobs See merge request gitlab-org/gitlab-ce!29156
| * | Specify exception identifer in catch blocksast-catch-unexpected-tokenPaul Gascou-Vaillancourt2019-06-041-1/+1
|/ /
* | Merge branch 'fix-external-dashboard-specs' into 'master'Clement Ho2019-06-041-3/+5
|\ \ | | | | | | | | | | | | Fix "operation settings external dashboard component" Jest specs See merge request gitlab-org/gitlab-ce!29160
| * | Fix submit button selector in specsPaul Gascou-Vaillancourt2019-06-041-3/+5
| | |
* | | Merge branch 'ce-9578-adjust-opened-issues-count-and-completion-rate' into ↵Robert Speicher2019-06-046-96/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Port: EE adjust burndown chart opened issues count See merge request gitlab-org/gitlab-ce!28777
| * | | Adjust burndown chart opened issues countce-9578-adjust-opened-issues-count-and-completion-rateAlexandru Croitor2019-06-046-96/+33
| | | | | | | | | | | | | | | | | | | | | | | | * Adjust opened issues count in the milestone burndown chart to match current opened issues in the milestone. * Fix completion rate calculation to include milestones only.
* | | | Merge branch 'fe-jestify-specs-starting-with-a-1' into 'master'Mike Greiling2019-06-044-14/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Jestify some specs that start with "A" See merge request gitlab-org/gitlab-ce!28727
| * | | | Jestify autosave spec and add localStorage helperfe-jestify-specs-starting-with-a-1Paul Slaughter2019-06-042-11/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The helper was needed because `jest.spyOn` would not work on this special window object property. The only way we could successfully spy on `localStorage` was with this helper.
| * | | | Jestify api specPaul Slaughter2019-05-301-1/+1
| | | | |
| * | | | Jestify activities specPaul Slaughter2019-05-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add `jQuery` to global in `test_setup`. This was needed because: - `vendor/jquery.endless-scroll` depends on it. - Adding it to `global` in the spec itself didn't work.
* | | | | Merge branch '61045-charts-with-many-overlapping-series-display-incorrectly' ↵Filipa Lacerda2019-06-043-5/+10
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Charts with many overlapping series display incorrectly" Closes #61045 See merge request gitlab-org/gitlab-ce!29127
| * | | | Resolve "Charts with many overlapping series display incorrectly"Adriel Santiago2019-06-043-5/+10
|/ / / /
* | | | Merge branch '61964-unicorn-instrumentation' into 'master'Bob Van Landuyt2019-06-047-35/+156
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds ruby and unicorn instrumentation Closes #61964 See merge request gitlab-org/gitlab-ce!28499
| * | | | Add comment to clarify system proc stat field61964-unicorn-instrumentationRyan Cobb2019-06-041-0/+2
| | | | |
| * | | | Remove unnecessary super call in unicorn samplerRyan Cobb2019-06-031-4/+0
| | | | |
| * | | | Update documentation to indicate new metrics for 12.0Ryan Cobb2019-05-291-11/+11
| | | | |
| * | | | Merge branch 'master' into 61964-unicorn-instrumentationRyan Cobb2019-05-29866-78182/+10957
| |\ \ \ \
| * | | | | Fix typo in system.rbRyan Cobb2019-05-201-1/+1
| | | | | |
| * | | | | Adds ruby and unicorn instrumentationRyan Cobb2019-05-207-29/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds ruby and unicorn instrumentation. This was originally intended in 11.11 but due to performance concerns it was reverted. This new commit foregoes the sys-proctable gem was causing performance issues previously.
* | | | | | Merge branch 'fe-61453-helpers' into 'master'Fatih Acet2019-06-0412-70/+222
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Connect Frontend and backend for external dashboard link Closes #61453 See merge request gitlab-org/gitlab-ce!28431
| * | | | | | Handle external dashboard form submissionAdriel Santiago2019-06-0412-70/+222
|/ / / / / / | | | | | | | | | | | | | | | | | | Connect frontend UI with backend api for external dashboard link
* | | | | | Merge branch 'nfriend-update-eslint-config-dependency-version' into 'master'Mike Greiling2019-06-042-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump up @gitlab/eslint-config dependency version to 1.6.0 See merge request gitlab-org/gitlab-ce!29147
| * | | | | | Bump up @gitlab/eslint-config dependency versionNathan Friend2019-06-042-5/+5
| | | | | | |
* | | | | | | Merge branch 'bump-auto-devops-helm-2-14-0' into 'master'Mayra Cabrera2019-06-042-2/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Helm version in Auto-DevOps.gitlab-ci.yml See merge request gitlab-org/gitlab-ce!28527
| * | | | | | | Bump Helm version in Auto-DevOps.gitlab-ci.ymlbump-auto-devops-helm-2-14-0Thong Kuah2019-06-042-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/helm/helm/releases/tag/v2.14.0 for upstream changelog
* | | | | | | | Update CHANGELOG.md for 11.11.2GitLab Release Tools Bot2019-06-047-30/+17
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Update CHANGELOG.md for 11.10.6GitLab Release Tools Bot2019-06-043-10/+17
| |/ / / / / / |/| | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'winh-issue-boards-setIssueDetail' into 'master'Clement Ho2019-06-044-3/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract setIssueDetail() into issue boards store See merge request gitlab-org/gitlab-ce!29071
| * | | | | | | Extract setIssueDetail() into issue boards storeWinnie Hellmann2019-06-044-3/+18
|/ / / / / / /
* | | | | | | Merge branch 'pb-update-gitaly-1-45-0' into 'master'Bob Van Landuyt2019-06-042-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GITALY_SERVER_VERSION to 1.45.0 See merge request gitlab-org/gitlab-ce!29109
| * | | | | | | Update GITALY_SERVER_VERSION to 1.45.0pb-update-gitaly-1-45-0Patrick Bajao2019-06-042-1/+6
| | | | | | | |
* | | | | | | | Merge branch 'ce-fix-vue-spec-warning' into 'master'Fatih Acet2019-06-042-11/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warning in spec from committing unused mutation See merge request gitlab-org/gitlab-ce!28815
| * | | | | | | | Fix warning in spec from committing unused mutationce-fix-vue-spec-warningSimon Knox2019-05-292-11/+0
| | | | | | | | |
* | | | | | | | | Merge branch '57037-fix-mr-checkboxes-mobile-alignment' into 'master'Fatih Acet2019-06-043-48/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR checkboxes alignment on mobile Closes #57037 See merge request gitlab-org/gitlab-ce!28845
| * | | | | | | | | Fix MR checkboxes alignment on mobile57037-fix-mr-checkboxes-mobile-alignmentPaul Slaughter2019-05-303-48/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does this by removing the `.accept-control` class which was only causing problems.
* | | | | | | | | | Merge branch 'winh-issue-boards-applyFilter' into 'master'Phil Hughes2019-06-043-18/+54
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract toggleFilter() into issue boards store See merge request gitlab-org/gitlab-ce!29083
| * | | | | | | | | | Extract toggleFilter() into issue boards storeWinnie Hellmann2019-06-043-18/+54
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'bvl-design-diff-notes-ce' into 'master'Douwe Maan2019-06-045-12/+34
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjustments related to DiffNotes on diffs outside of a project's main repository See merge request gitlab-org/gitlab-ce!29023
| * | | | | | | | | | Get `repository` from noteable in DiffNotesBob Van Landuyt2019-06-031-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Getting the `repository` directly from the noteable in DiffNotes allows us to use a different repository when the DiffNote is not on a project repository. It is only the first step in decoupling the DiffNote from a project's main repository.
| * | | | | | | | | | Make `resolvable_types` a class methodBob Van Landuyt2019-06-035-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This turns Notable::RESOLVABLE_TYPES into a `Notable.resolvable_types`. That allows us to override it in EE.
* | | | | | | | | | | Merge branch 'mr-widget-merge-error' into 'master'Filipa Lacerda2019-06-047-13/+24
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rendering of merge request in merge request widget Closes #40246 See merge request gitlab-org/gitlab-ce!28238
| * | | | | | | | | | | Update rendering of merge request in merge request widgetPhil Hughes2019-06-047-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/40246
* | | | | | | | | | | | Merge branch 'increase-move-issue-dropdown-height' into 'master'Filipa Lacerda2019-06-042-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase height of move issue dropdown See merge request gitlab-org/gitlab-ce!29087