summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [CE] Reduce diff with EE in spec/models/project_wiki_spec.rbce-reduce-diff-in-spec-modelsRémy Coutable2019-04-021-1/+0
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* [CE] Reduce diff with EE in spec/models/project_team_spec.rbRémy Coutable2019-04-021-0/+24
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* [CE] Reduce diff with EE in spec/models/project_spec.rbRémy Coutable2019-04-021-0/+9
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* [CE] Reduce diff with EE in spec/models/environment_spec.rbRémy Coutable2019-04-021-1/+3
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* [CE] Reduce diff with EE in spec/models/concerns/prometheus_adapter_spec.rbRémy Coutable2019-04-021-5/+6
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'kube_helm_auto_devops_213' into 'master'Kamil Trzciński2019-04-022-2/+7
|\ | | | | | | | | Bump Kubectl and Helm in Auto-DevOps.gitlab-ci.yml See merge request gitlab-org/gitlab-ce!26534
| * Bump Kubectl and Helm in Auto-DevOps.gitlab-ci.ymlkube_helm_auto_devops_213Thong Kuah2019-04-012-2/+7
| |
* | Merge branch 'coverage-parsing-examples' into 'master'Grzegorz Bizon2019-04-021-3/+6
|\ \ | | | | | | | | | | | | Tweak coverage parsing examples See merge request gitlab-org/gitlab-ce!26732
| * | Add Elixir example for built in coverage tooloptikfluffel2019-03-281-0/+3
| | |
| * | Move NodeJS examples next to each otheroptikfluffel2019-03-281-3/+3
| | |
* | | Merge branch '56557-add-managed-field-to-cluster' into 'master'Kamil Trzciński2019-04-023-1/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adds `managed` boolean column to Clusters table Closes #56557 See merge request gitlab-org/gitlab-ce!26675
| * | | Add new field to Clusters tableMayra Cabrera2019-04-023-1/+24
|/ / / | | | | | | | | | | | | | | | | | | | | | Adds boolean field 'managed' to clusters table. This new column will be used to distinguish those clusters that are automatically managed by gitlab. Needed for https://gitlab.com/gitlab-org/gitlab-ce/issues/56557
* | | Merge branch 'fix-transfer-group-possibilities' into 'master'James Lopez2019-04-024-2/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix group transfer selection possibilities Closes #52295 See merge request gitlab-org/gitlab-ce!26123
| * | | Fix group transfer selection possibilitiesPeter Marko2019-04-024-2/+49
|/ / /
* | | Merge branch '58879-document-local-tiller-docs' into 'master'Evan Read2019-04-021-14/+36
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Document that local tiller is used for Auto DevOps Closes #58879 See merge request gitlab-org/gitlab-ce!26688
| * | | Document that local tiller is used for Auto DevOpsThong Kuah2019-04-021-14/+36
|/ / / | | | | | | | | | | | | Also note that apps will be released into the Kubernetes namespace for the environment, and that GitLab < 11.4 used a dedicated Tiller
* | | Merge branch 'weimeng-master-patch-83366' into 'master'Stan Hu2019-04-021-1/+4
|\ \ \ | | | | | | | | | | | | | | | | Fix attempting to drop views in PostgreSQL See merge request gitlab-org/gitlab-ce!26836
| * | | Fix attempting to drop views in PostgreSQLweimeng-master-patch-83366Wei-Meng Lee2019-04-021-1/+4
| | | |
* | | | Merge branch 'docs-anchors-17' into 'master'Evan Read2019-04-021-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Docs: Fix anchor to deprecated variables doc See merge request gitlab-org/gitlab-ce!26788
| * | | Docs: Fix anchor to deprecated variables docMarcel Amirault2019-04-021-1/+1
|/ / /
* | | Merge branch 'docs/restructure-ci-envs-and-deployment' into 'master'Mike Lewis2019-04-013-322/+450
|\ \ \ | | | | | | | | | | | | | | | | Refactor and restructure environments page See merge request gitlab-org/gitlab-ce!26400
| * | | Fixes from reviewdocs/restructure-ci-envs-and-deploymentEvan Read2019-03-271-3/+1
| | | |
| * | | Refactor and restructure environments pageEvan Read2019-03-263-322/+452
| | | | | | | | | | | | | | | | | | | | - Groups content into relevant sections. - Content edited.
* | | | Merge branch 'docs/refactor-pipeline-schedules' into 'master'Mike Lewis2019-04-011-55/+66
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor and fix pipeline schedules See merge request gitlab-org/gitlab-ce!26756
| * | | | Refactor and fix pipeline schedulesEvan Read2019-04-011-55/+66
|/ / / /
* | | | Merge branch 'bvl-stream-io-into-gitaly' into 'master'Nick Thomas2019-04-016-11/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow streaming io objects into Gitaly See merge request gitlab-org/gitlab-ce!26738
| * | | | Allow streaming io objects into GitalyBob Van Landuyt2019-04-016-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to set the encoding of an IO passed without reading it into memory. This is useful if we want to stream files into Gitaly. Like we do when uploading a new file to the repository.
* | | | | Merge branch 'winh-rejected-jest-promises' into 'master'Fatih Acet2019-04-012-4/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fail Jest tests for unhandled Promise rejections Closes #56053 See merge request gitlab-org/gitlab-ce!26424
| * | | | | Fail correct test for Promisewinh-rejected-jest-promisesWinnie Hellmann2019-03-291-4/+7
| | | | | |
| * | | | | Fail for unhandled Promise rejections in JestWinnie Hellmann2019-03-292-0/+21
| | | | | |
* | | | | | Merge branch 'nfriend-css-updates-for-gitlab-design-system-compliance' into ↵Fatih Acet2019-04-013-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update border radius of form controls and remove space above page titles See merge request gitlab-org/gitlab-ce!24497
| * | | | | | Update border radius of form controls and remove space above page titlesnfriend-css-updates-for-gitlab-design-system-complianceNathan Friend2019-02-143-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes changes to global CSS styles to bring the product closer to compliance with Pajamas (the GitLab design system).
* | | | | | | Merge branch 'winh-jest-jquery-matchers' into 'master'Clement Ho2019-04-014-1/+15
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add jQuery matchers to Jest Closes #59637 See merge request gitlab-org/gitlab-ce!26722
| * | | | | | Add jQuery matchers to JestWinnie Hellmann2019-04-014-1/+15
|/ / / / / /
* | | | | | Merge branch 'sh-force-gc-after-import' into 'master'Douglas Barbosa Alexandre2019-04-015-3/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force a full GC after importing a project Closes #59477 See merge request gitlab-org/gitlab-ce!26803
| * | | | | | Force a full GC after importing a projectsh-force-gc-after-importStan Hu2019-04-015-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During a project import, it's possible that new branches are created by the importer to handle pull requests that have been created from forked projects, which would increment the `pushes_since_gc` value via `HousekeepingService.increment!` before a full garbage collection gets to run. This causes HousekeepingService to skip the full `git gc` and move to the incremental repack mode. To ensure that a garbage collection is run to pack refs and objects, explicitly execute the task. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59477
* | | | | | | Merge branch 'frozen_string_spec_workers' into 'master'Douglas Barbosa Alexandre2019-04-01118-0/+236
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add # frozen_string_literal to spec/workers See merge request gitlab-org/gitlab-ce!26790
| * | | | | | | Add frozen_string_literal to spec/workersfrozen_string_spec_workersThong Kuah2019-04-01118-0/+236
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Adds `# frozen_string_literal: true` to spec/workers ruby files
* | | | | | | Merge branch 'jc-remove-find-all-tags-ff' into 'master'Douglas Barbosa Alexandre2019-04-012-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove find all tags feature flag See merge request gitlab-org/gitlab-ce!26746
| * | | | | | | Remove find all tags feature flagjc-remove-find-all-tags-ffJohn Cai2019-03-282-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'bvl-pipeline-spec-broken-master' into 'master'Robert Speicher2019-04-011-3/+35
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the pipeline feature spec Closes #59747 See merge request gitlab-org/gitlab-ce!26822
| * | | | | | | | Refactor pipeline_specBob Van Landuyt2019-04-011-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure we load the page as part of the spec, instead of a before block. So we could still perform setup inside shared examples, avoiding failures caught by data being wrongly cached when loading the page multiple times during a single spec
* | | | | | | | | Merge branch 'fix-container-scanning-on-k8s' into 'master'Douglas Barbosa Alexandre2019-04-013-6/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Container Scanning for Kubernetes Runners Closes gitlab-ee#5763 and gitlab-ee#6636 See merge request gitlab-org/gitlab-ce!26793
| * | | | | | | | | Fix Container Scanning for Kubernetes Runnersfix-container-scanning-on-k8sPhilippe Lafoucrière2019-03-313-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6636 closes https://gitlab.com/gitlab-org/gitlab-ee/issues/5763
* | | | | | | | | | Merge branch 'first-proof-reader' into 'master'Marcia Ramos2019-04-011-0/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add details for the first proof reader request See merge request gitlab-org/gitlab-ce!26812
| * | | | | | | | | | Add details for the first proof reader requestfirst-proof-readerRay Paik2019-04-011-0/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'design-management-permissions-ce' into 'master'Douwe Maan2019-04-012-2/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow extra permissions in Project & Issue GraphQL types See merge request gitlab-org/gitlab-ce!26818
| * | | | | | | | | | Extra permissions in Project & Issue GraphQLBob Van Landuyt2019-04-012-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow extra permissions for the `Types::ProjectType` and `Types:IssueType` GraphQL types. As we'll be adding more permissions in CE. Now this spec only validates if all the expected permissions are present, but it will not fail if there are more.
* | | | | | | | | | | Merge branch '59441-add-base-domain-to-cluster-api' into 'master'Nick Thomas2019-04-015-3/+21
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include cluster domain in Project Clusters API Closes #59441 See merge request gitlab-org/gitlab-ce!26735
| * | | | | | | | | | | Include cluster domain into Project Cluster APIMayra Cabrera2019-04-015-3/+21
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Domain was introduced on 11.8 and was not included on the Project Cluster API. With this change user will be able to include domain when adding and updating a cluster. Domain will also be included on the GET calls. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59441