summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | 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
| * | | | | | | | | | | | | | Update backup_restore.md instructions for Google Cloud Storage bucket ↵Mike Cave2019-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configuration to specify required access control option
* | | | | | | | | | | | | | | Merge branch 'patch-11' into 'master'Achilleas Pipinellis2019-03-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc/uploads: fix another path to omnibus uploads See merge request gitlab-org/gitlab-ce!22330
| * | | | | | | | | | | | | | | update default omnibus upload pathElan Ruusamäe2019-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | small explanation here (by @balasankarc): https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/2777#note_131420508
* | | | | | | | | | | | | | | | Merge branch 'create-identity-provider-policy' into 'master'Nick Thomas2019-03-209-31/+133
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move out link\unlink ability checks to a policy See merge request gitlab-org/gitlab-ce!26278
| * | | | | | | | | | | | | | | | Move out link\unlink ability checks to a policyPavel Shutsin2019-03-199-31/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can extend the policy in EE for additional behavior
* | | | | | | | | | | | | | | | | Merge branch '59057-buttons-on-top-from-a-user-profile-page-on-mobile' into ↵Fatih Acet2019-03-202-15/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Improve mobile UI on User Profile page Closes #59057 See merge request gitlab-org/gitlab-ce!26240
| * | | | | | | | | | | | | | | | | Improve mobile UI on User Profile pageTakuya Noguchi2019-03-162-15/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | | | | | | | | | Merge branch 'winh-yarn-test-command' into 'master'Clement Ho2019-03-202-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce yarn test to run Jest and Karma See merge request gitlab-org/gitlab-ce!26320
| * | | | | | | | | | | | | | | | | | Update docs on running frontend testsWinnie Hellmann2019-03-191-6/+4
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Introduce yarn test to run Jest and KarmaWinnie Hellmann2019-03-191-0/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'winh-replty-to-comment-tooltip' into 'master'Clement Ho2019-03-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move reply to comment tooltip to the top Closes #59198 See merge request gitlab-org/gitlab-ce!26366
| * | | | | | | | | | | | | | | | | | Move reply to comment tooltip to the topWinnie Hellmann2019-03-201-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'docs-ci-examples-devops_and_game_dev_with_gitlab_ci_cd' into ↵Achilleas Pipinellis2019-03-201-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update 'DevOps and Game Dev with GitLab CI/CD' doc See merge request gitlab-org/gitlab-ce!25944
| * | | | | | | | | | | | | | | | | | | Update 'DevOps and Game Dev with GitLab CI/CD' docTakuya Noguchi2019-03-111-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | | | | | | | | | | | Merge branch ↵Fatih Acet2019-03-201-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '6774-admin-dashboard-users-statistics-link-should-be-placed-differently' into 'master' Backport of Admin Dashboard "Users Statistics" link should be placed differently See merge request gitlab-org/gitlab-ce!26192
| * | | | | | | | | | | | | | | | | | | Move User Statistics link into a button groupBrett Walker2019-03-141-2/+3
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jramsay/dedupe-beta-docs' into 'master'Achilleas Pipinellis2019-03-201-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add beta caution to hashed object pools See merge request gitlab-org/gitlab-ce!26289
| * | | | | | | | | | | | | | | | | | | Add beta caution to hashed object poolsJames Ramsay2019-03-201-0/+5
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'docs/fix-note-lists' into 'master'Achilleas Pipinellis2019-03-2021-18/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix note lists throughout docs See merge request gitlab-org/gitlab-ce!26346
| * | | | | | | | | | | | | | | | | | | Fix note lists throughout docsEvan Read2019-03-2021-18/+35
|/ / / / / / / / / / / / / / / / / / /