summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Update job detail sidebar for post-merge pipelinesNathan Friend2019-03-205-49/+316
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the job detail view sidebar to accommodate new states introduced as part of the post-merge pipeline feature.
* | | | | | | | | | Merge branch 'gitaly-version-v1.29.0' into 'master'Douwe Maan2019-03-212-1/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to v1.29.0 See merge request gitlab-org/gitlab-ce!26406
| * | | | | | | | | | Upgrade Gitaly to v1.29.0GitalyBot2019-03-212-1/+6
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'osw-multi-line-suggestions-parsing' into 'master'Grzegorz Bizon2019-03-2111-9/+167
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare multi-line suggestions for rendering in Markdown See merge request gitlab-org/gitlab-ce!26107
| * | | | | | | | | | Implement multi-line suggestions filteringOswaldo Ferreira2019-03-2011-9/+167
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements the filtering logic for `suggestion:-x+y` syntax.
* | | | | | | | | | Merge branch 'nfriend-update-pipeline-list-view' into 'master'Filipa Lacerda2019-03-2110-66/+302
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update pipeline list view to accommodate post-merge request pipelines See merge request gitlab-org/gitlab-ce!25690
| * | | | | | | | | | Update pipeline list viewNathan Friend2019-03-2010-66/+302
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the pipeline page and related components to include new pipeline information added by the post-merge pipeline feature.
* | | | | | | | | | Merge branch 'ce-1974-update-user-name-upon-ldap-sync' into 'master'Douwe Maan2019-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle nil name in Gitlab::Auth::LDAP::Person#name See merge request gitlab-org/gitlab-ce!26364
| * | | | | | | | | Handle nil name in Gitlab::Auth::LDAP::Person#nameRémy Coutable2019-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch ↵Sean McGivern2019-03-216-31/+160
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '58805-allow-incomplete-commit-data-to-be-fetched-from-collection' into 'master' Enrich commits with full data in CommitCollection Closes #58805 See merge request gitlab-org/gitlab-ce!26144
| * | | | | | | | | | Handle blank projects in CommitCollection#enrich!Luke Duncalfe2019-03-211-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A project is needed in order to fetch data from gitaly. Projects can be absent from commits in certain rare situations (like when viewing a MR of a deleted fork). In these cases, assume that the enriched data is not needed. See this comment: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26144#note_152191106 "It's led to a dilemma about where to "fix" this in code. I'm going to fix it by allowing CommitCollection#enrich! to just return unenriched commits when a project is missing, essentially "silently failing". I hope this is the right decision. It's going with the assumption that calls in these situations in the future are not needing the full data. The alternative would be to allow CommitCollection#enrich! to still error, but handle it in the methods that call #enrich!, however that might lead to brittleness in future when working with project-less MRs."
| * | | | | | | | | | Scope out merge commits in MergeRequest specLuke Duncalfe2019-03-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the code for excluding merge commits from the commit collection (CommitCollection#without_merge_commits) was not working when the commits had come from a merge request. Now that this has been fixed, these tests fails. They should always have been written to exclude merge commits when comparing.
| * | | | | | | | | | Enrich commits with full data in CommitCollectionLuke Duncalfe2019-03-186-29/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow incomplete commit records to load their full data from gitaly. Commits can be based on a Hash of data retrieved from PostgreSQL, and this data can be intentionally incomplete in order to save space. A new method #gitaly? has been added to Gitlab::Git::Commit, which returns true if the underlying data source of the Commit is a Gitaly::GitCommit. CommitCollection now has a method #enrich which replaces non-gitaly commits in place with commits from gitaly. CommitCollection#without_merge_commits has been updated to call this method, as in order to determine a merge commit we need to have parent data. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/58805
* | | | | | | | | | | Merge branch 'k8s_new_deployment_labels' into 'master'Rémy Coutable2019-03-219-15/+85
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dashboards to additionally use new environment selector See merge request gitlab-org/gitlab-ce!25623
| * | | | | | | | | | | Update dashboards to additionally use new environment selectorJames Fargher2019-03-219-15/+85
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy boards now will check for app.gitlab.com/env and app.gitlab.com/app
* | | | | | | | | | | Merge branch '57115-just-in-time-k8s-resource-creation' into 'master'Clement Ho2019-03-2054-51/+943
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create project-specific Kubernetes resources just-in-time See merge request gitlab-org/gitlab-ce!25586
| * | | | | | | | | | | Amend cluster and auto devops troubleshooting docsTiger2019-03-202-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update these sections to reflect Kubernetes resources now being created as a build prerequisite. Remove section about deploys not being triggered as it is no longer accurate.
| * | | | | | | | | | | Don't recreate Kubernetes namespaces if they existTiger2019-03-203-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of attempting to create or update a Kubernetes namespace on every deploy, only do so when we know it doesn't exist yet.
| * | | | | | | | | | | Create one Kubernetes namespace for a deploymentTiger2019-03-205-32/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of creating a Kubernetes namespace on every cluster related to a project, only create one on the cluster the project is about to be deployed to.
| * | | | | | | | | | | Add feature flag for build preparing stateTiger2019-03-209-1/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flag is on by default, but allows us to revert back to the old behaviour if we encounter any problems.
| * | | | | | | | | | | Tweak FactoryBot definition for clustersTiger2019-03-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only create an associated project or group if there were none already specified.
| * | | | | | | | | | | Add build prerequisite for Kubernetes namespacesTiger2019-03-204-1/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Builds that have deployments require Kubernetes resources to be created before the build can be deployed. These resources are no longer created when the cluster is created, which allows us to only create the resources required by each specific build.
| * | | | | | | | | | | Create framework for build prerequisitesTiger2019-03-2018-7/+336
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces the concept of Prerequisites for a CI build. If a build has unmet prerequisites it will go through the :preparing state before being made available to a runner. There are no actual prerequisites yet, so current behaviour is unchanged.
| * | | | | | | | | | | Add :preparing status to HasStatusTiger2019-03-2025-32/+354
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces a new status for builds between :created and :pending that will be used when builds require one or more prerequisite actions to be completed before being picked up by a runner (such as creating Kubernetes resources before deploying). The existing :created > :pending transition is unchanged, so only builds that require preparation will use the :preparing status.
* | | | | | | | | | | | Merge branch '59208-add-option-to-keep-cached-fields-during-serialization' ↵Stan Hu2019-03-205-16/+58
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add option to whitelist _html fields from attributes on CacheMarkdownField See merge request gitlab-org/gitlab-ce!26374
| * | | | | | | | | | | | Rename the hidden option to whitelistedDouglas Barbosa Alexandre2019-03-203-9/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix spec for Gitlab::JsonCacheDouglas Barbosa Alexandre2019-03-201-7/+23
| | | | | | | | | | | | |
| * | | | | | | | | | | | Does not exclude message_html from attributesDouglas Barbosa Alexandre2019-03-202-1/+7
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add option to not exclude _html fields from attributesDouglas Barbosa Alexandre2019-03-202-8/+27
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'dz-bump-httparty' into 'master'Stan Hu2019-03-203-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump httparty to version 1.16.4 Closes #44342 See merge request gitlab-org/gitlab-ce!25893
| * | | | | | | | | | | | | Bump httparty to version 1.16.4Dmitriy Zaporozhets2019-03-193-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | Merge branch '57598-use-vendored-files-for-ci-config' into 'master'Grzegorz Bizon2019-03-2024-83/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Use vendored files for CI config" Closes #57598 See merge request gitlab-org/gitlab-ce!25871
| * | | | | | | | | | | | | | Move gitlab-org specific config to .gitlab-ci.ymlMatija Čupić2019-03-152-7/+8
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Hardcode CodeQuality version usedMatija Čupić2019-03-151-3/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Use templated CodeQuality jobMatija Čupić2019-03-151-25/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add Code-Quality CI templateMatija Čupić2019-03-151-0/+26
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Tidy up CI templatesMatija Čupić2019-03-1522-64/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tidies up CI templates to have better formatting. * Removes redundant whitespace * Removes redundant newlines
* | | | | | | | | | | | | | | Merge remote-tracking branch 'dev/master'Alex Hanselka2019-03-204-1/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dev/master: Update CHANGELOG.md for 11.8.3 Update CHANGELOG.md for 11.7.7 Only return `commands_changes` used in frontend
| * | | | | | | | | | | | | | Merge branch 'security-2826-fix-project-serialization-in-quick-actions' into ↵Alex Hanselka2019-03-203-1/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix project serialization in quick actions response Closes #2826 See merge request gitlab/gitlabhq!3001
| | * | | | | | | | | | | | | | Only return `commands_changes` used in frontendHeinrich Lee Yu2019-03-183-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When executing quick actions, this limits the `commands_changes` response to only those used by the frontend
| * | | | | | | | | | | | | | | Update CHANGELOG.md for 11.8.3GitLab Release Tools Bot2019-03-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | Update CHANGELOG.md for 11.7.7GitLab Release Tools Bot2019-03-191-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | Merge branch 'qa-nightly-87-auto-devops-banner-is-hidden-on-empty-repo' into ↵Dan Davison2019-03-201-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix Auto DevOps QA Smoke test hidden banner Closes gitlab-org/quality/nightly#87 See merge request gitlab-org/gitlab-ce!26254
| * | | | | | | | | | | | | | | Fix Auto DevOps QA Smoke test hidden bannerDylan Griffith2019-03-201-6/+0
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The banner is no longer being shown for empty repos since https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26024 . We could have made this assertion after pushing the repo but this is not the thing that really needs to be in an integration or smoke test as it is already tested in spec/.../projects/show/user_interacts_with_auto_devops_banner_spec
* | | | | | | | | | | | | | | Merge branch ↵53956-add-a-new-smoke-test-to-create-a-pipelineStan Hu2019-03-203-3/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '59208-fix-error-500-on-every-page-when-active-broadcast-message-present-after-upgrading-to-11-9-0' into 'master' Gracefully handles excluded fields from attributes during serialization on JsonCache Closes #59208 See merge request gitlab-org/gitlab-ce!26368
| * | | | | | | | | | | | | | | Add CHANGELOG entryDouglas Barbosa Alexandre2019-03-201-0/+6
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Gracefully handles excluded fields from attributes during serializationDouglas Barbosa Alexandre2019-03-202-3/+54
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'avoid_es_loading_project_ci_status' into 'master'Stan Hu2019-03-204-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid loading pipeline status in project search See merge request gitlab-org/gitlab-ce!26342
| * | | | | | | | | | | | | | | | Avoid loading pipeline status in project searchMario de la Ossa2019-03-194-4/+10
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'patch-47' into 'master'Achilleas Pipinellis2019-03-201-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update backup_restore.md instructions for Google Cloud Storage bucket... See merge request gitlab-org/gitlab-ce!25628