summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Single source of truth for merge requestsdocs/ssot-merge-requestsAchilleas Pipinellis2019-06-0614-91/+263
| | | | | | | | - Edit pages under user/project/merge_requests and add the relevant types in the frontmatter. - Clean up descriptions. Based on https://gitlab.com/groups/gitlab-org/-/epics/1280
* Merge branch 'ci-variable-expression-con-dis-junction' into 'master'Kamil Trzciński2019-06-0624-264/+957
|\ | | | | | | | | CI variable expression conjunction/disjunction See merge request gitlab-org/gitlab-ce!27925
| * && and || operators for CI Pipeline expressions.drew cimino2019-06-0424-264/+957
| | | | | | | | | | | | Refactored regex pattern matching to eagerly return tokens Packaged behind a default-enabled feature flag and added operator documentation.
* | Merge branch 'revert-86900f00' into 'master'Grzegorz Bizon2019-06-067-19/+16
|\ \ | | | | | | | | | | | | | | | | | | Revert "Disable retrying cancelled jobs" Closes #62350 See merge request gitlab-org/gitlab-ce!29201
| * | Revert "Merge branch..."revert-86900f00Kamil Trzciński2019-06-057-19/+16
| | | | | | | | | This reverts merge request !27503
* | | Merge branch 'docs/port-insights-from-ee' into 'master'Achilleas Pipinellis2019-06-061-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Port EE changes from doc/user/project/insights/index.md Closes gitlab-ee#11974 See merge request gitlab-org/gitlab-ce!29252
| * | | Port EE changes from doc/user/project/insights/index.mdAchilleas Pipinellis2019-06-061-1/+2
| | | |
* | | | Merge branch '62760-quarantine-it' into 'master'Rémy Coutable2019-06-061-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantine spec/models/ci/pipeline_schedule_spec.rb Closes #62760 See merge request gitlab-org/gitlab-ce!29257
| * | | | Quarantine this flaky testLin Jen-Shin2019-06-061-1/+1
|/ / / / | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/62760
* | | | Merge branch 'docs-api-merge-2' into 'master'Achilleas Pipinellis2019-06-065-105/+378
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Docs: Merge 5 api docs from EE to CE See merge request gitlab-org/gitlab-ce!28633
| * | | | Docs: Merge 5 api docs from EE to CEMarcel Amirault2019-06-065-105/+378
|/ / / /
* | | | Merge branch 'simplify-pipeline-notification-check' into 'master'Sean McGivern2019-06-062-13/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Simplify notification check for participating See merge request gitlab-org/gitlab-ce!29188
| * | | | Simplify notification check for participatingsimplify-pipeline-notification-checkHeinrich Lee Yu2019-06-062-13/+4
| | | | |
* | | | | Merge branch 'ce-10854-elasticsearch_avoid_db' into 'master'Sean McGivern2019-06-068-4/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport of 10854-elasticsearch_avoid_db See merge request gitlab-org/gitlab-ce!28579
| * | | | | Backport of 10854-elasticsearch_avoid_dbce-10854-elasticsearch_avoid_dbMario de la Ossa2019-06-058-4/+15
| | | | | |
* | | | | | Merge branch 'docs/ssot_saml_sso' into 'master'Achilleas Pipinellis2019-06-061-7/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit "SAML SSO" for SSOT See merge request gitlab-org/gitlab-ce!29248
| * | | | | | Edit "SAML SSO" for SSOTRussell Dickenson2019-06-061-7/+23
|/ / / / / /
* | | | | | Merge branch 'docs/ssot_roadmap' into 'master'Achilleas Pipinellis2019-06-061-2/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit Group's "Roadmap" for SSOT See merge request gitlab-org/gitlab-ce!29245
| * | | | | | Edit Group's "Roadmap" for SSOTRussell Dickenson2019-06-061-2/+25
|/ / / / / /
* | | | | | Merge branch '60323-inline-validation-for-users-name-and-username-length' ↵Kushal Pandya2019-06-069-44/+138
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Inline validation for user's name and username length" Closes #60323 See merge request gitlab-org/gitlab-ce!28095
| * | | | | | Resolve "Inline validation for user's name and username length"Jiaan2019-06-069-44/+138
|/ / / / / /
* | | | | | Merge branch 'docs/fix-bullet-list-ha' into 'master'Achilleas Pipinellis2019-06-061-53/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown for HA topic See merge request gitlab-org/gitlab-ce!29244
| * | | | | | Fix markdown for HA topicEvan Read2019-06-061-53/+48
|/ / / / / /
* | | | | | Merge branch '60034-default-web-ide-s-merge-request-checkbox-to-true' into ↵Phil Hughes2019-06-0617-112/+377
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Default Web IDE's merge request checkbox to true" Closes #60034 See merge request gitlab-org/gitlab-ce!28665
| * | | | | | Default MR checkbox to true in most cases60034-default-web-ide-s-merge-request-checkbox-to-trueSam Bigelow2019-06-0617-112/+377
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Pull the new MR option out into it's own component - Default MR checkbox to true when creating a new MR and committing to a branch that does not have an MR - Still change the MR checkbox to false when a user is on a branch that already has an MR - Hide MR option when on a branch that already has an MR and committing to current branch - Don't default to true when committing directly to master
* | | | | | | Merge branch 'create-merge-request-create-pipeline-service' into 'master'Bob Van Landuyt2019-06-063-25/+109
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce service for merge request pipeline creation See merge request gitlab-org/gitlab-ce!28781
| * | | | | | | Introduce service for merge request pipeline creationcreate-merge-request-create-pipeline-serviceShinya Maeda2019-06-063-25/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't have a way to create MR pipeline today, this is one of the headaches for users. This change is a preliminary work for the capability.
* | | | | | | | Merge branch 'ce-10795-add-epic-tree' into 'master'Phil Hughes2019-06-064-4/+242
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport: Show tree within Epic containing child Epics and Issues See merge request gitlab-org/gitlab-ce!28787
| * | | | | | | | CE Backport: Show tree within Epic containing child Epics and IssuesKushal Pandya2019-06-064-4/+242
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/ssot_insights' into 'master'Achilleas Pipinellis2019-06-061-0/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit "Insights" content to meet SSOT guidelines See merge request gitlab-org/gitlab-ce!29238
| * | | | | | | | Edit "Insights" content to meet SSOT guidelinesRussell Dickenson2019-06-061-0/+16
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/ssot_epics' into 'master'Achilleas Pipinellis2019-06-061-0/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edited "Epics" to comply with SSOT See merge request gitlab-org/gitlab-ce!29236
| * | | | | | | | Edited "Epics" to comply with SSOTRussell Dickenson2019-06-061-0/+16
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/ssot_custom_project_templates' into 'master'Achilleas Pipinellis2019-06-061-0/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edited "Custom group-level project templates" for SSOT See merge request gitlab-org/gitlab-ce!29235
| * | | | | | | | Edited "Custom group-level project templates" for SSOTRussell Dickenson2019-06-061-0/+16
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-time-window-default' into 'master'Phil Hughes2019-06-063-20/+57
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the selected time window for metrics dashboard See merge request gitlab-org/gitlab-ce!29152
| * | | | | | | | Use the selected time window for metrics dashboardSarah Yasonik2019-06-063-20/+57
|/ / / / / / / /
* | | | | | | | Merge branch '11213-add-docs-on-dast-weekly-update-ce' into 'master'Achilleas Pipinellis2019-06-061-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note on weekly updates of dast Docker image See merge request gitlab-org/gitlab-ce!29126
| * | | | | | | | Add note on weekly updates of dast Docker imageVictor Zagorodny2019-06-061-0/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'ashmckenzie/enable-better-errors-repl' into 'master'Bob Van Landuyt2019-06-061-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow BetterErrors REPL to be enabled See merge request gitlab-org/gitlab-ce!29034
| * | | | | | | | Allow BetterErrors REPL to be enabledashmckenzie/enable-better-errors-replAsh McKenzie2019-06-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the BetterErrors REPL to be available when your GitLab instance is listening on something _other_ than localhost.
* | | | | | | | | Merge branch 'docs/ssot-git-topics' into 'master'Achilleas Pipinellis2019-06-064-89/+157
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSoT audit fixes for some topics in git section Closes #61512 See merge request gitlab-org/gitlab-ce!28966
| * | | | | | | | SSoT audit fixesEvan Read2019-06-064-89/+157
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements part of the single source of truth audit fixes for the topics/git section.
* | | | | | | | Merge branch 'patch-18' into 'master'Achilleas Pipinellis2019-06-061-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc: add git mr command promotion See merge request gitlab-org/gitlab-ce!28860
| * | | | | | | | doc: add git mr command promotionElan Ruusamäe2019-05-291-0/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'update-psd-doc' into 'master'Achilleas Pipinellis2019-06-062-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update project security dashboard documentation See merge request gitlab-org/gitlab-ce!28681
| * | | | | | | | | Update project security dashboard documentationPaul Gascou-Vaillancourt2019-06-062-0/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch 'ce-jej/fix-git-http-with-sso-enforcement' into 'master'Jan Provaznik2019-06-064-0/+42
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid setting Gitlab::Session on sessionless requests and Git HTTP See merge request gitlab-org/gitlab-ce!29146
| * | | | | | | | | Avoid setting Gitlab::Session on Git HTTP requestsce-jej/fix-git-http-with-sso-enforcementJames Edwards-Jones2019-06-051-0/+1
| | | | | | | | | |
| * | | | | | | | | Avoid setting Gitlab::Session on sessionless requestsJames Edwards-Jones2019-06-053-0/+41
| | | | | | | | | |