summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Enable project-level JIT resource creation60617-enable-project-cluster-jitTiger2019-06-183-14/+0
| | | | | | | | | | Previously this behaviour was only available to group and instance-level clusters, as some project clusters relied on Kubernetes credentials being passed through to the runner instead of having their resources managed by GitLab (which is not available when using JIT). These clusters have been migrated to unmanaged, so resources can be created on demand for the remaining managed clusters.
* Merge branch ↵Thong Kuah2019-06-183-3/+14
|\ | | | | | | | | | | | | | | | | '60617-allow-switching-from-gitlab-managed-to-unmanaged-clusters' into 'master' Allow switching clusters between managed/unmanaged Closes #60617 See merge request gitlab-org/gitlab-ce!29322
| * Allow switching clusters between managed/unmanagedTiger2019-06-183-3/+14
| | | | | | | | | | | | Any resources created while the cluster was managed will be untouched, allowing users to set/unset this flag as they please.
* | Make KubernetesService readonlyJames Fargher2019-06-188-60/+62
| | | | | | | | | | | | | | | | We are deprecating this service in favor of instance wide clusters. Therefore we removed some code that is not anymore needed for a readonly cluster and also we added some flags to allow for this deprecation. These flags are to be removed in the next release when we finally completelly remove KubernetesService.
* | Merge branch 'migrate_k8s_service_integration' into 'master'Thong Kuah2019-06-171-1/+1
|\ \ | |/ |/| | | | | Migrate Kubernetes service integration templates to clusters See merge request gitlab-org/gitlab-ce!28534
| * Allow a user defined namespace on non-gitlab managed clustersJames Fargher2019-05-301-1/+1
| | | | | | | | | | Since they are not GitLab managed we wont make assumptions about the namespaces used
* | Merge branch '63079-exclude-k8s-namespaces-with-no-service-account-token' ↵Thong Kuah2019-06-171-3/+22
|\ \ | | | | | | | | | | | | | | | | | | into 'master' Don't use Kubernetes namespaces with no token See merge request gitlab-org/gitlab-ce!29643
| * | Don't use Kubernetes namespaces with no token63079-exclude-k8s-namespaces-with-no-service-account-tokenTiger2019-06-171-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever we are selecting a namespace to use for a deployment or to query a cluster we want to exclude Kubernetes namespace records that don't have a token set as they will not have the required permissions. However when configuring clusters, we want to use the original namespace record even if it has no token, as a namespace has to be unique on a cluster.
* | | Merge branch 'qa-ml-validate-after-visit-in-block' into 'master'Dan Davison2019-06-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | [CE] Validate page after visit in block See merge request gitlab-org/gitlab-ce!29524
| * | | Allow the Projects Dashboard to be validatedqa-ml-validate-after-visit-in-blockMark Lapierre2019-06-121-1/+1
| | | |
* | | | Merge branch '56737-commits-and-mr-events-on-jira-api' into 'master'Stan Hu2019-06-171-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose currently supported events properly on services API Closes #56737 See merge request gitlab-org/gitlab-ce!29736
| * | | | 56737 Expose currently supported events properly on services APIZsolt Kovari2019-06-161-2/+2
| | | | |
* | | | | Merge branch 'review-toolbar-data-addition-ce-backport' into 'master'Filipa Lacerda2019-06-172-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Toolbar backport changes for CE See merge request gitlab-org/gitlab-ce!29758
| * | | | | Add backport linesreview-toolbar-data-addition-ce-backportsarahghp2019-06-172-0/+2
| | | | | |
* | | | | | Backport fix MR search by approversJustin Boyson2019-06-173-2/+5
| | | | | |
* | | | | | Merge branch 'visual-review-apps-fix-dropdown' into 'master'Mike Greiling2019-06-172-11/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Dropdown to Stick to MR View App Button Closes gitlab-ee#12184 See merge request gitlab-org/gitlab-ce!29767
| * | | | | | Move Dropdown to Stick to MR View App ButtonAndrew Fontaine2019-06-172-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dropdown of changed pages in the review app should be attached to the view app button. This moves it to the correct place. The Review App button is to the right of both of those.
* | | | | | | Merge branch 'generate-spans-for-sections' into 'master'Sean McGivern2019-06-172-10/+47
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add collapsible sections to job log See merge request gitlab-org/gitlab-ce!28642
| * | | | | | | Update class namesFilipa Lacerda2019-06-141-1/+1
| | | | | | | |
| * | | | | | | Adds specs and changelog - squashFilipa Lacerda2019-06-131-6/+5
| | | | | | | |
| * | | | | | | Adds margins to the section linesFilipa Lacerda2019-06-122-8/+13
| | | | | | | |
| * | | | | | | Moves JS into the vue componentFilipa Lacerda2019-06-121-10/+43
| | | | | | | |
| * | | | | | | Removes CSSFilipa Lacerda2019-06-121-19/+0
| | | | | | | |
| * | | | | | | Merge branch 'master' into generate-spans-for-sectionsFilipa Lacerda2019-06-12569-3118/+6159
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (784 commits) Update Serverless.gitlab-ci-yml to fix lint warning Document when milestones and labels links are missing Update git object deduplication overview Apply tooltip on truncated commit title Add link to import video Update merge options for auto merge strategies Update note style in various docs Add link to Auto DevOps demo video Add link to Groups video Remove glossary content and make necessary doc edits to clarify terms Docs for Gitlab Runner docker use of private registries Metrics reports documentation is incomplete Update issues/index.md with note on label priority sorting API issues - minor cleanup of permission check Fix gl_dropdown scrolling to top on assignee click Final doc review Remove docs for a removed ES rake task Fixed markdown link in Docker compose note Documented the Admin Area's *Groups* page Docs: Updating issue data and actions doc ...
| * | | | | | | | Generate <span> with all sectionsKamil Trzciński2019-05-231-0/+19
| | | | | | | | |
* | | | | | | | | Merge branch 'ce-11981-show-merge-train-position' into 'master'Filipa Lacerda2019-06-172-1/+13
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | CE backport for gitlab-org/gitlab-ee!14064: Add merge train position indicator See merge request gitlab-org/gitlab-ce!29561
| * | | | | | | | Add merge train position message (CE)Nathan Friend2019-06-172-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds an informational message under the pipeline block in the merge request widget that displays the current position of the merge request on the merge train.
* | | | | | | | | CE port of IP address restriction for groupsImre Farkas2019-06-171-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch '58886-issue-tracker-fields' into 'master'Sean McGivern2019-06-174-0/+66
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Create models for issue trackers data See merge request gitlab-org/gitlab-ce!28598
| * | | | | | | | Create models for issue trackers data58886-issue-tracker-fieldsJarka Košanová2019-06-134-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - create tables for storing issue trackers properties - add model and basic logic & spec
* | | | | | | | | Fix plan stage queryGosia Ksionek2019-06-172-61/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix plan stage query and the way it is displayed
* | | | | | | | | Merge branch '9490-record-repository_type-on-lfs_objects_projects-ce' into ↵Grzegorz Bizon2019-06-176-11/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' CE backport for gitlab-ee!13894 (Save repository_type to LfsObjectsProject) See merge request gitlab-org/gitlab-ce!29179
| * | | | | | | | | CE backport for changes in EE MR 138949490-record-repository_type-on-lfs_objects_projects-ceLuke Duncalfe2019-06-176-11/+21
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports to CE changes that allow the recording of the repository_type in the table lfs_objects_projects. This is in order to allow future pruning of unreferenced LFS objects, as we will need to know which repository to look in for the LFS pointer file. The EE MR that contains the original code and a full explanation of the changes is https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894 EE Issue https://gitlab.com/gitlab-org/gitlab-ee/issues/9490 Note that there was a lot of CE code changed in the EE MR because we want to allow the wiki repository to also use LFS. See https://gitlab.com/gitlab-org/gitlab-ce/issues/43721. As the wiki is an unlicensed feature, a full backport is required to enable this.
* | | | | | | | | Merge branch 'error-pipelines-for-blocked-users' into 'master'Grzegorz Bizon2019-06-173-4/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preventing blocked users and their PipelineSchdules from creating new Pipelines Closes #47756 See merge request gitlab-org/gitlab-ce!27318
| * | | | | | | | | preventing blocked users and their PipelineSchdules from creating new Pipelinesdrew cimino2019-06-043-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated several specs and factories to accomodate new permissions
* | | | | | | | | | Allow Developer role to delete tags via container registry apiJason Goodman2019-06-172-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings the API permissions in line with the UI permissions
* | | | | | | | | | Resolve "Docker registry date not accurate"Nick Kipling2019-06-171-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch '8429-enforce-template-inclusion-in-pipelines-fe-backport' into ↵Filipa Lacerda2019-06-171-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Backporting required template form on admin CI/CD See merge request gitlab-org/gitlab-ce!29154
| * | | | | | | | | | Backporting an EE admin form8429-enforce-template-inclusion-in-pipelines-fe-backportScott Hampton2019-06-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE added a required template form on the CI/CD page. This is a backport for that change.
* | | | | | | | | | | Merge branch 'sh-fix-issue-63158' into 'master'Rémy Coutable2019-06-171-1/+17
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inability to set visibility_level on project via API Closes #63158 See merge request gitlab-org/gitlab-ce!29578
| * | | | | | | | | | | Fix inability to set visibility_level on project via APIsh-fix-issue-63158Stan Hu2019-06-141-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider the scenario: 1. The default visibility level is set to internal 2. A user attempts to create a private project within a private group Previously this would always fail because default_value_for would overwrite the private visibility setting, no matter what visibility_level were specified. This was happening because default_value_for was confused by the default value of 0 specified by the database schema. default_value_for attempts to assign the default value in the block by checking whether the attribute has changed. The problem is that since the default value by the database was 0, and the user requested 0, this appeared as though no changes were made. As a result, default_value_for would always overwrite the user's preference. To fix this, we remove the use of default_value_for and only set the visibility level to the default application setting when no preference has been given at creation time. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63158
* | | | | | | | | | | | Merge branch 'revert-3a50fc5d' into 'master'Filipa Lacerda2019-06-179-81/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'" See merge request gitlab-org/gitlab-ce!29684
| * | | | | | | | | | | | Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'"revert-3a50fc5dKamil Trzciński2019-06-149-81/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !26853
* | | | | | | | | | | | | Merge branch '62910-task-completion-status-gql-pderichs' into 'master'Sean McGivern2019-06-173-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make task completion status available via GraphQL Closes #62910 See merge request gitlab-org/gitlab-ce!29573
| * | | | | | | | | | | | | Add task count and completed count to graphql types62910-task-completion-status-gql-pderichsPatrick Derichs2019-06-153-0/+15
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs for task completion status (graphql) Fix style issues Changed format of constants in spec Refactor specs to reduce creation of records Reduce parameters to merge request creation Use set's for project and user Move let's out of it_behaves_like block Fix description parameter Fix format of lets Use dig to get task completion status out of graphql response Modified rspec output Add changelog entry
* | | | | | | | | | | | | Merge branch 'gitlab-ui-259-style-checkboxes' into 'master'Kushal Pandya2019-06-171-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make changes suggested by Pedro for UX See merge request gitlab-org/gitlab-ce!29324
| * | | | | | | | | | | | Apply improved styling based on UX feedbackgitlab-ui-259-style-checkboxesSam Bigelow2019-06-121-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Only apply extra margins and borders between checkbox components - Change cursor to `not-allowed` when checkbox is disabled - Adjust handling of inline checkbox styling vs block
* | | | | | | | | | | | | Backport: Pendo POC snippetDonald Cook2019-06-151-0/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '57813-merge-request-tabs-do-not-handle-ctrl-click-correctly' ↵Fatih Acet2019-06-141-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Merge request tabs do not handle ctrl+click correctly" Closes #57813 See merge request gitlab-org/gitlab-ce!29506
| * | | | | | | | | | | | | Allow command and control click to work on MR tabs57813-merge-request-tabs-do-not-handle-ctrl-click-correctlySam Bigelow2019-06-121-5/+5
| |/ / / / / / / / / / / /