summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Edit License docs to comply with SSOT guidelinesdocs/ssot_admin_area_licenseRussell Dickenson2019-05-221-0/+16
|
* Merge branch 'update-docs-alert-bot' into 'master'Achilleas Pipinellis2019-05-211-1/+1
|\ | | | | | | | | Add to docs sentence about alertbot opening issues See merge request gitlab-org/gitlab-ce!28503
| * Add to docs sentence about alertbot opening issuesupdate-docs-alert-botSeth Engelhard2019-05-201-1/+1
| |
* | Merge branch '10798-remove-dind-req-for-dast' into 'master'Ash McKenzie2019-05-213-41/+26
|\ \ | | | | | | | | | | | | Remove dind from dast template See merge request gitlab-org/gitlab-ce!28083
| * | Make env vars consistentPhilippe Lafoucrière2019-05-213-41/+26
|/ / | | | | | | `DAST_TARGET_AVAILABILITY_TIMEOUT` already defaults to 60 in `analyze`
* | Merge branch 'leipert-move-pdf-js' into 'master'Mike Greiling2019-05-209-66430/+20
|\ \ | | | | | | | | | | | | Move to pdf.js distributed with npm See merge request gitlab-org/gitlab-ce!28156
| * | Move to pdf.js distributed with npmleipert-move-pdf-jsLukas Eipert2019-05-109-66430/+20
| | | | | | | | | | | | | | | | | | pdf.js is available on npm. Importing the dependency from there instead of vendoring it has certain benefits, e.g. the discoverability of updates (especially security fixes).
* | | Merge branch '10364-dismissal-reason-FE-CE' into 'master'Clement Ho2019-05-201-2/+4
|\ \ \ | | | | | | | | | | | | | | | | Adds the CE backport for EE!11226 See merge request gitlab-org/gitlab-ce!27835
| * | | Adds a CE backport for 11226Sam Beckham2019-05-201-2/+4
|/ / / | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11226
* | | Merge branch 'tr-update-group-security-dashboard-docs' into 'master'Achilleas Pipinellis2019-05-201-0/+0
|\ \ \ | | | | | | | | | | | | | | | | Update group security dashboard docs - CE backport See merge request gitlab-org/gitlab-ce!28471
| * | | Update group security dashboard docs - CE backportTristan Read2019-05-201-0/+0
|/ / /
* | | Merge branch 'docs/minor-edit-of-unintall-apps-docs' into 'master'Achilleas Pipinellis2019-05-201-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Slight edit of text from earlier merge Closes #61447 See merge request gitlab-org/gitlab-ce!28511
| * | | Slight edit of text from earlier mergeEvan Read2019-05-201-3/+3
|/ / /
* | | Merge branch '61697-add-project-id-to-le-common-name' into 'master'Robert Speicher2019-05-202-2/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cert Manager problems with Group/Instance cluster" Closes #61697 See merge request gitlab-org/gitlab-ce!28373
| * | | Add project ID to Let's Encrypt common name61697-add-project-id-to-le-common-nameTiger2019-05-162-2/+7
| | | |
* | | | Merge branch 'docs-play-all-manual-jobs-in-a-stage' into 'master'Achilleas Pipinellis2019-05-201-0/+13
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Adds documentation for 'Play all manual' button See merge request gitlab-org/gitlab-ce!28502
| * | | Adds documentation for stage buttonMayra Cabrera2019-05-201-0/+13
|/ / / | | | | | | | | | | | | | | | | | | Includes missing documentation for 'Play all manual' builds a single stage. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/28741
* | | Merge branch 'sh-fix-rugged-get-tree-entries-recursive' into 'master'Douglas Barbosa Alexandre2019-05-203-1/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | API: Fix recursive flag not working with Rugged get_tree_entries flag Closes #61979 See merge request gitlab-org/gitlab-ce!28494
| * | | API: Fix recursive flag not working with Rugged get_tree_entries flagStan Hu2019-05-203-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempting to use the API endpoint /projects/:id/repository/tree?recursive=true would only return a subset of the results since the full recursive list wasn't actually being returned. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61979
* | | | Merge branch 'fe-rename-vue-component-helper-ce' into 'master'Mike Greiling2019-05-2021-19/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [CE Port] Rename vue_component_helper to text_helper See merge request gitlab-org/gitlab-ce!28358
| * | | | Rename vue_component_helper to text_helperfe-rename-vue-component-helper-cePaul Slaughter2019-05-1621-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** This file only contains a few text based helper functions. It has nothing to do with Vue or Vue components.
* | | | | Merge branch 'update-babel-to-7.4.4' into 'master'Mike Greiling2019-05-203-201/+404
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade babel to 7.4.4 See merge request gitlab-org/gitlab-ce!28437
| * | | | | Upgrade babel to 7.4.4Takuya Noguchi2019-05-183-201/+404
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | Merge branch 'environment_terminal_methods' into 'master'Stan Hu2019-05-202-5/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Environment#deployment_platform method instead See merge request gitlab-org/gitlab-ce!28000
| * | | | | | Use Environment#deployment_platform method insteadenvironment_terminal_methodsThong Kuah2019-05-202-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As this method does have `deployment_platform(environment: self.name)`, which is what the form EE needs. Allows us to remove two overrides in EE.
* | | | | | | Merge branch 'docs/add-timezone-formatting' into 'master'Evan Read2019-05-201-9/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Add TZInfo formatted timezones See merge request gitlab-org/gitlab-ce!26743
| * | | | | | | Docs: Add TZInfo formatted timezonesDavid Coy2019-05-201-9/+17
|/ / / / / / /
* | | | | | | Merge branch '59105-padding-unclickable-pipeline-job' into 'master'Filipa Lacerda2019-05-202-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix padding of unclickable pipeline dropdown items to match links Closes #59105 See merge request gitlab-org/gitlab-ce!28485
| * | | | | | | Fix padding of unclickable pipeline dropdown items to match linksAnnabel Dunstone Gray2019-05-202-1/+6
| | | | | | | |
* | | | | | | | Merge branch 'docs/junit-mention-mr' into 'master'Evan Read2019-05-201-0/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to JUnit test reports from the MR index page Closes #59240 See merge request gitlab-org/gitlab-ce!28341
| * | | | | | | | Link to JUnit test reports from the MR index pageAchilleas Pipinellis2019-05-201-0/+8
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/patch-61' into 'master'Achilleas Pipinellis2019-05-201-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency scanning docs - Clarify sort order See merge request gitlab-org/gitlab-ce!28493
| * | | | | | | | Update dependency scanning docs - Clarify sort orderLucas Charles2019-05-201-1/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/clarify-defaulting-behaviour-pipelines-for-mr' into 'master'Achilleas Pipinellis2019-05-201-3/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix content to not contradict Closes #61270 See merge request gitlab-org/gitlab-ce!28456
| * | | | | | | | Fix content to not contradictEvan Read2019-05-201-3/+6
|/ / / / / / / /
* | | | | | | | Merge branch '10761-add-mr-widget-review-instructions-ce-backport' into 'master'Fatih Acet2019-05-208-27/+100
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport for Add Visual Review instructions to the MR Widget See merge request gitlab-org/gitlab-ce!28196
| * | | | | | | | Add backport changesSarah Groff Hennigh-Palermo2019-05-208-27/+100
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Adds backport changes for ee
* | | | | | | | Merge branch 'if-10137-ee_specific_lines_groups_api' into 'master'Lin Jen-Shin2019-05-202-14/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of Move EE specific lines in API::Groups See merge request gitlab-org/gitlab-ce!28467
| * | | | | | | | CE port of Move EE specific lines in API::GroupsImre Farkas2019-05-202-14/+19
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-pipelines-for-merged-ref-must-use-only-merge-requests' ↵Evan Read2019-05-201-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Clarify how to enable pipelines for merged results Closes gitlab-ee#11401 See merge request gitlab-org/gitlab-ce!28050
| * | | | | | | | Clarify how to enable pipelines for merged resultsShinya Maeda2019-05-201-0/+4
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-instance_level_clusters' into 'master'Evan Read2019-05-203-6/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial instance level cluster docs See merge request gitlab-org/gitlab-ce!27873
| * | | | | | | | Initial instance level cluster docsJames Fargher2019-05-203-6/+31
|/ / / / / / / /
* | | | | | | | Merge branch 'fu7mu4-master-patch-90398' into 'master'Rémy Coutable2019-05-201-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Tomo Dote to Japanese proofreader See merge request gitlab-org/gitlab-ce!28263
| * | | | | | | | Add Tomo Dote to Japanese proofreaderfu7mu42019-05-111-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'revert-c5a9bc17' into 'master'Yorick Peterse2019-05-209-153/+29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '56850-add-new-unicorn-metrics' into 'master'" See merge request gitlab-org/gitlab-ce!28483
| * | | | | | | | | Revert "Merge branch '56850-add-new-unicorn-metrics' into 'master'"revert-c5a9bc17Ryan Cobb2019-05-209-153/+29
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | This reverts merge request !27474
* | | | | | | | | Merge branch 'fl-fix-next-flag-for-good' into 'master'Phil Hughes2019-05-203-2/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Next badge must be visible when canary flag is true See merge request gitlab-org/gitlab-ce!28478
| * | | | | | | | | Next badge must be visible when canary flag is truefl-fix-next-flag-for-goodFilipa Lacerda2019-05-203-2/+7
| | | | | | | | | |
* | | | | | | | | | Merge branch '59313-mandatory-window-params' into 'master'Jan Provaznik2019-05-202-13/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require time window params in metrics dashboard Closes #59313 See merge request gitlab-org/gitlab-ce!28194