summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Document our GraphQL Enum standardsLuke Duncalfe2019-09-061-0/+45
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/67012
* | | | | | | | | | Merge branch 'docs/add-introduced-version' into 'master'Evan Read2019-09-061-0/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs required version for mirroring status See merge request gitlab-org/gitlab-ce!32691
| * | | | | | | | | Add docs required version for mirroring statusSteve Azzopardi2019-09-061-0/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs-followup-66309' into 'master'Evan Read2019-09-062-6/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change introduced style for better rendering Closes #66309 See merge request gitlab-org/gitlab-ce!32690
| * | | | | | | | | Change introduced style for better renderingMarcel Amirault2019-09-062-6/+9
|/ / / / / / / / /
* | | | | | | | | Merge branch 'dblessing-update-arch-diag' into 'master'Evan Read2019-09-061-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Sidekiq in architecture diagram See merge request gitlab-org/gitlab-ce!32673
| * | | | | | | | | Update Sidekiq in architecture diagramdblessing-update-arch-diagDrew Blessing2019-09-041-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix-markdownlint-error' into 'master'Evan Read2019-09-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove trailing whitespace from applications.md See merge request gitlab-org/gitlab-ce!32726
| * | | | | | | | | | Remove trailing whitespace from applications.mdPaul Gascou-Vaillancourt2019-09-051-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'add-label-push-opts' into 'master'Ash McKenzie2019-09-069-16/+234
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support adding and removing labels w/ push opts Closes #5942 See merge request gitlab-org/gitlab-ce!31831
| * | | | | | | | | | Simplify filter_labels method in IssuableBaseServiceadd-label-push-optsChristian Couder2019-09-041-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IssuableBaseService::filter_labels() has been refactored to call a new `label_ids_to_filter` method.
| * | | | | | | | | | Avoid creating labels when removing themChristian Couder2019-09-043-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IssuableBaseService has been updated so that labels are not created when push options to remove them are received.
| * | | | | | | | | | Support adding and removing labels w/ push optsChristian Couder2019-09-048-8/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequests::PushOptionsHandlerService has been updated to allow adding and removing labels to a merge request using git push options. To create a new merge request and add 2 labels to it: git push -u origin -o merge_request.create \ -o merge_request.label="My label 1" \ -o merge_request.label="My label 2" To update an existing merge request and remove a label while adding a different label: git push -u origin -o merge_request.label="My added label" \ -o merge_request.unlabel="My removed label" Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/64320
* | | | | | | | | | | Merge branch 'docs-cluster-apps-jetstack-cert-manager' into 'master'Evan Read2019-09-061-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs for cluster apps cert-manager See merge request gitlab-org/gitlab-ce!32628
| * | | | | | | | | | | Update docs for cert-managerdocs-cluster-apps-jetstack-cert-managerThong Kuah2019-09-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 5142bd738e7d, we are using the official chart now.
* | | | | | | | | | | | Merge branch 'TheToddLuci0-master-patch-38747' into 'master'67087-backfill-graphql-type-field-descriptionsEvan Read2019-09-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update to use -e to pass environment See merge request gitlab-org/gitlab-ce!32495
| * | | | | | | | | | | Update to use -e as passing as TheToddLuci02019-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "DEPRECATION WARNING: Passing the environment's name as a regular argument is deprecated and will be removed in the next Rails version. Please, use the -e option instead."
* | | | | | | | | | | | Merge branch 'mc-fixes-pot-failure' into 'master'Stan Hu2019-09-062-4/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes pot failure See merge request gitlab-org/gitlab-ce!32721
| * | | | | | | | | | | Fixes pot failureMayra Cabrera2019-09-062-4/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes duplicated entry
* | | | | | | | | | | Merge branch 'doc-update-database-load-balancing-log-docs' into 'master'Evan Read2019-09-052-18/+15
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs for database load balancing logs See merge request gitlab-org/gitlab-ce!32535
| * | | | | | | | | | | Update docs for database load balancing logsHordur Freyr Yngvason2019-09-052-18/+15
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The database load balancing docs had some mention of the logs that needed to be updated, and the logs doc had an absolute link to gitlab.com instead of a relative link to a markdown file.
* | | | | | | | | | | Merge branch '66467-enable-error-tracking-only-user-can-read-sentry-logs' ↵Clement Ho2019-09-0511-14/+86
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Display `more information` docs link on error tracking page when users do not have permissions to enable that feature See merge request gitlab-org/gitlab-ce!32365
| * | | | | | | | | | | If user can't activate error tracking display a learn more button pointingManeschi Romain2019-09-0511-14/+86
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to doc
* | | | | | | | | | | Merge branch 'mc-refactors-rack-attack-requests-spec' into 'master'Stan Hu2019-09-052-212/+231
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactors rack attack requests spec See merge request gitlab-org/gitlab-ce!32708
| * | | | | | | | | | | Refactors rack attack requests specMayra Cabrera2019-09-052-212/+231
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Creates a shared_examples files under shared_examples/requests * Moves web specs into the shared examples file * Moves let definitions to the block that uses them
* | | | | | | | | | | Merge branch 'update-text-on-import-and-mirroring-forms' into 'master'Stan Hu2019-09-055-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update text on project import and mirroring forms See merge request gitlab-org/gitlab-ce!32567
| * | | | | | | | | | | Update text on project import and mirroring formsAdam Hegyi2019-09-055-0/+5
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'fix-tmp-gitignore' into 'master'Robert Speicher2019-09-054-3/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Git ignore rules for tmp/, shared/, and plugins/ See merge request gitlab-org/gitlab-ce!32589
| * | | | | | | | | | | Fix Git ignore for tmp/, shared/, and plugins/fix-tmp-gitignoreYorick Peterse2019-09-034-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old rules meant that any future changes to these directories would require the use of `git add -f` to be staged. This is problematic for the upcoming FOSS-only mirror of GitLab. Any changes to be synced to this mirror are staged using `git add --all .`, which due to the Git ignore rules would not add the tmp/ and shared/ directories. This then leads to various specs failing because they expect certain sub-directories of these directories to be available. This commit changes the rules so that we include the .gitkeep files, ignore other files, and completely ignore anything in tmp/test. This requires that the rules are specified in tmp/.gitignore and shared/.gitignore, instead of the top-level .gitignore, without this I could not get Git to include the .gitkeep files properly.
* | | | | | | | | | | | Merge branch 'group_level_jupyterhub' into 'master'Robert Speicher2019-09-057-30/+87
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group level JupyterHub See merge request gitlab-org/gitlab-ce!32512
| * | | | | | | | | | | | Allow group install of JupyterHubgroup_level_jupyterhubJames Fargher2019-09-055-28/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes limitations on cluster types that can install JupyterHub
| * | | | | | | | | | | | Allow JupyterHub in group level UIJames Fargher2019-09-052-2/+38
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'instance-level-security-dashboard-ce' into 'master'Mike Greiling2019-09-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds route for instance level security dashboard See merge request gitlab-org/gitlab-ce!32548
| * | | | | | | | | | | | Adds route for instance level security dashboardMark Florian2019-09-051-0/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'add-approval-status-field-lm-ce' into 'master'Rémy Coutable2019-09-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend License Compliance entity for Pipelines and MR view See merge request gitlab-org/gitlab-ce!32709
| * | | | | | | | | | | | Extend License Compliance entity for Pipelines and MR viewCan Eldem2019-09-051-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'dag-setup-test-env' into 'master'Rémy Coutable2019-09-055-7/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DAG changes for setup-test-env and review-deploy See merge request gitlab-org/gitlab-ce!32366
| * | | | | | | | | | | | Add DAG to setup-test-env jobs and review-cng-base to speed up pipelinedag-setup-test-envKyle Wiebers2019-09-055-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add needs for all jobs which require setup-test-env and move review-build-cng to additional stage review-prepare to decrease wait time for jobs in pipeline
* | | | | | | | | | | | | Merge branch 'danger-review-pipeline' into 'master'Rémy Coutable2019-09-054-3/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Danger Roulette rules for pipeline files See merge request gitlab-org/gitlab-ce!32616
| * | | | | | | | | | | | | Add Danger Roulette rules for pipeline filesdanger-review-pipelineKyle Wiebers2019-09-054-3/+23
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '67037-user-content-gitlab-static-net-brings-back-404-only' ↵Sean McGivern2019-09-053-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "user-content.gitlab-static.net brings back 404 only" See merge request gitlab-org/gitlab-ce!32703
| * | | | | | | | | | | | | | Set asset_proxy_whitelist default to gitlab host67037-user-content-gitlab-static-net-brings-back-404-onlyBrett Walker2019-09-053-1/+21
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'update-issue-template-for-permissions' into 'master'Achilleas Pipinellis2019-09-051-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note about updating permissions See merge request gitlab-org/gitlab-ce!32700
| * | | | | | | | | | | | | | Add note about updating permissionsTetiana Chupryna2019-09-051-2/+3
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'update_user_group_name' into 'master'Achilleas Pipinellis2019-09-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update user permission group name Closes #65975 See merge request gitlab-org/gitlab-ce!32321
| * | | | | | | | | | | | | | Update user permission nameNikita Potapenko2019-08-281-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'issue-32741' into 'master'Kamil Trzciński2019-09-0516-12/+356
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Interruptible builds for redundant pipelines See merge request gitlab-org/gitlab-ce!23464
| * | | | | | | | | | | | | | New interruptible attribute supported in YAML parsing.Cédric Tabin2019-09-0516-12/+356
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since it is not possible to dynamically detect if a job is automatically cancellable or not, a this new attribute is necessary. Moreover, it let the maintainer of the repo to adjust the behaviour of the auto cancellation feature to match exactly what he needs.
* | | | | | | | | | | | | | Merge branch 'docs-markdown-guidelines' into 'master'Marcia Ramos2019-09-052-66/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update doc guidelines with markdownlint info See merge request gitlab-org/gitlab-ce!32273
| * | | | | | | | | | | | | Adjust markdown linting guidelinesMarcel Amirault2019-09-052-66/+39
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move details of markdownlint mostly to the documentation index for a SSoT, and link apropriately