Skip to content

Commit b7dfe2a

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent 25cb337 commit b7dfe2a

File tree

689 files changed

+16993
-3707
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

689 files changed

+16993
-3707
lines changed

‎.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
VERSION merge=ours
12
Dangerfile gitlab-language=ruby
23
db/schema.rb merge=merge_db_schema

‎.gitlab-ci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,3 @@ include:
4242
- local: .gitlab/ci/setup.gitlab-ci.yml
4343
- local: .gitlab/ci/test-metadata.gitlab-ci.yml
4444
- local: .gitlab/ci/yaml.gitlab-ci.yml
45-
- local: .gitlab/ci/ee-specific-checks.gitlab-ci.yml

‎.gitlab/ci/ee-specific-checks.gitlab-ci.yml

-22
This file was deleted.

‎.gitlab/ci/rails.gitlab-ci.yml

+138-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
- master@gitlab/gitlabhq
99
- master@gitlab/gitlab-ee
1010

11+
.only-gitlab-ee:
12+
only:
13+
- branches@gitlab-org/gitlab-ee
14+
- tags@gitlab-org/gitlab-ee
15+
1116
.rake-exec:
1217
extends:
1318
- .default-tags
@@ -231,7 +236,7 @@ db:migrate-from-v11.11.0:
231236
variables:
232237
SETUP_DB: "false"
233238
script:
234-
- git fetch https://gitlab.com/gitlab-org/gitlab-ce.git v11.11.0
239+
- git fetch https://gitlab.com/gitlab-org/gitlab-ee.git v11.11.0-ee
235240
- git checkout -f FETCH_HEAD
236241
- sed -i "s/gem 'oj', '~> 2.17.4'//" Gemfile
237242
- sed -i "s/gem 'bootsnap', '~> 1.0.0'/gem 'bootsnap'/" Gemfile
@@ -314,3 +319,135 @@ coverage:
314319
- coverage/index.html
315320
- coverage/assets/
316321
- tmp/memory_test/
322+
323+
## EE-specific content
324+
.rspec-base-ee:
325+
extends:
326+
- .rspec-base
327+
- .only-gitlab-ee
328+
script:
329+
- JOB_NAME=( $CI_JOB_NAME )
330+
- TEST_TOOL=${JOB_NAME[0]}
331+
- TEST_LEVEL=${JOB_NAME[1]}
332+
- DATABASE=${JOB_NAME[2]}
333+
- export KNAPSACK_REPORT_PATH=knapsack/${CI_PROJECT_NAME}/${TEST_TOOL}_${TEST_LEVEL}_${DATABASE}_ee_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
334+
- export KNAPSACK_GENERATE_REPORT=true KNAPSACK_LOG_LEVEL=debug KNAPSACK_TEST_DIR=spec
335+
- export CACHE_CLASSES=true
336+
- cp ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH}
337+
- scripts/gitaly-test-spawn
338+
- date
339+
- 'export KNAPSACK_TEST_FILE_PATTERN=$(ruby -r./lib/quality/test_level.rb -e "puts Quality::TestLevel.new(%(ee/)).pattern(:${TEST_LEVEL})")'
340+
- mkdir -p tmp/memory_test
341+
- export MEMORY_TEST_PATH="tmp/memory_test/ee_${TEST_TOOL}_${TEST_LEVEL}_${DATABASE}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_memory.csv"
342+
- knapsack rspec "--color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag level:${TEST_LEVEL} --tag ~geo"
343+
- date
344+
345+
.rspec-base-pg-ee:
346+
extends: .rspec-base-ee
347+
services:
348+
- name: postgres:9.6
349+
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
350+
- name: redis:alpine
351+
- name: docker.elastic.co/elasticsearch/elasticsearch:5.6.12
352+
353+
rspec unit pg ee:
354+
extends: .rspec-base-pg-ee
355+
parallel: 7
356+
357+
rspec integration pg ee:
358+
extends: .rspec-base-pg-ee
359+
parallel: 3
360+
361+
rspec system pg ee:
362+
extends: .rspec-base-pg-ee
363+
parallel: 5
364+
365+
.rspec-base-pg-geo:
366+
extends:
367+
- .rspec-base
368+
- .only-gitlab-ee
369+
script:
370+
- JOB_NAME=( $CI_JOB_NAME )
371+
- TEST_TOOL=${JOB_NAME[0]}
372+
- TEST_LEVEL=${JOB_NAME[1]}
373+
- DATABASE=${JOB_NAME[2]}
374+
- export KNAPSACK_TEST_FILE_PATTERN="ee/spec/**{,/*/**}/*_spec.rb" KNAPSACK_GENERATE_REPORT=true CACHE_CLASSES=true
375+
- export KNAPSACK_REPORT_PATH=knapsack/${CI_PROJECT_NAME}/${TEST_TOOL}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
376+
- cp ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH} ${KNAPSACK_REPORT_PATH}
377+
- source scripts/prepare_postgres_fdw.sh
378+
- scripts/gitaly-test-spawn
379+
- mkdir -p tmp/memory_test
380+
- export MEMORY_TEST_PATH="tmp/memory_test/ee_${TEST_TOOL}_${TEST_LEVEL}_${DATABASE}_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_memory.csv"
381+
- knapsack rspec "-Ispec --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag geo"
382+
383+
rspec geo pg ee:
384+
extends:
385+
- .rspec-base-pg-geo
386+
- .use-pg
387+
- .except-docs-qa-geo
388+
parallel: 3
389+
390+
rspec geo pg-10 ee:
391+
extends:
392+
- .rspec-base-pg-geo
393+
- .use-pg-10
394+
- .except-docs-qa-geo
395+
parallel: 3
396+
397+
quick-rspec geo pg ee:
398+
extends:
399+
- .rspec-base-pg-geo
400+
- .use-pg
401+
stage: quick-test
402+
only:
403+
- /(^geo[\/-].*|.*-geo$)/
404+
405+
quick-rspec geo pg-10 ee:
406+
extends:
407+
- .rspec-base-pg-geo
408+
- .use-pg-10
409+
stage: quick-test
410+
only:
411+
- /(^geo[\/-].*|.*-geo$)/
412+
413+
rspec quarantine pg ee:
414+
extends: rspec quarantine pg
415+
script:
416+
- export NO_KNAPSACK=1 CACHE_CLASSES=true
417+
- scripts/gitaly-test-spawn
418+
- bin/rspec --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml --tag quarantine -- ee/spec/
419+
420+
migration:upgrade-pg-ce-to-ee:
421+
extends:
422+
- .default-tags
423+
- .default-retry
424+
- .default-cache
425+
- .default-before_script
426+
- .use-pg
427+
- .except-docs-qa
428+
dependencies: ["setup-test-env"]
429+
variables:
430+
SETUP_DB: "false"
431+
script:
432+
- ruby -r./scripts/ee_specific_check/ee_specific_check -e'EESpecificCheck.fetch_remote_ce_branch'
433+
- git checkout -f FETCH_HEAD
434+
- . scripts/utils.sh
435+
- . scripts/prepare_build.sh
436+
- date
437+
- setup_db
438+
- date
439+
- git checkout -f $CI_COMMIT_SHA
440+
- date
441+
- . scripts/prepare_build.sh
442+
- date
443+
- bundle exec rake db:migrate
444+
445+
db:rollback geo:
446+
extends:
447+
- db:rollback
448+
- .only-gitlab-ee
449+
script:
450+
- bundle exec rake geo:db:migrate VERSION=20170627195211
451+
- bundle exec rake geo:db:migrate
452+
453+
## END of EE-specific content

‎.gitlab/ci/test-metadata.gitlab-ci.yml

+5
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ retrieve-tests-metadata:
2626
- mkdir -p rspec_profiling/
2727
- wget -O $FLAKY_RSPEC_SUITE_REPORT_PATH http://${TESTS_METADATA_S3_BUCKET}.s3.amazonaws.com/$FLAKY_RSPEC_SUITE_REPORT_PATH || rm $FLAKY_RSPEC_SUITE_REPORT_PATH
2828
- '[[ -f $FLAKY_RSPEC_SUITE_REPORT_PATH ]] || echo "{}" > ${FLAKY_RSPEC_SUITE_REPORT_PATH}'
29+
- wget -O $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH http://${TESTS_METADATA_S3_BUCKET}.s3.amazonaws.com/$EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH || rm $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH
30+
- '[[ -f $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH ]] || echo "{}" > ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH}'
2931

3032
update-tests-metadata:
3133
extends: .tests-metadata-state
@@ -41,6 +43,9 @@ update-tests-metadata:
4143
- echo "{}" > ${KNAPSACK_RSPEC_SUITE_REPORT_PATH}
4244
- scripts/merge-reports ${KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec_*_pg_node_*.json
4345
- '[[ -z ${TESTS_METADATA_S3_BUCKET} ]] || scripts/sync-reports put $TESTS_METADATA_S3_BUCKET $KNAPSACK_RSPEC_SUITE_REPORT_PATH'
46+
- echo "{}" > ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH}
47+
- scripts/merge-reports ${EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH} knapsack/${CI_PROJECT_NAME}/rspec_*_pg_ee_*node_*.json
48+
- '[[ -z ${TESTS_METADATA_S3_BUCKET} ]] || scripts/sync-reports put $TESTS_METADATA_S3_BUCKET $EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH'
4449
- rm -f knapsack/${CI_PROJECT_NAME}/*_node_*.json
4550
- scripts/merge-reports ${FLAKY_RSPEC_SUITE_REPORT_PATH} rspec_flaky/all_*_*.json
4651
- FLAKY_RSPEC_GENERATE_REPORT=1 scripts/prune-old-flaky-specs ${FLAKY_RSPEC_SUITE_REPORT_PATH}

‎.gitlab/issue_templates/Feature proposal.md

+4
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ If this feature requires changing permissions, this document https://docs.gitlab
4343

4444
<!-- Define both the success metrics and acceptance criteria. Note that success metrics indicate the desired business outcomes, while acceptance criteria indicate when the solution is working correctly. If there is no way to measure success, link to an issue that will implement a way to measure this. -->
4545

46+
### What is the type of buyer?
47+
48+
<!-- Which leads to: in which enterprise tier should this feature go? See https://about.gitlab.com/handbook/product/pricing/#four-tiers -->
49+
4650
### Links / references
4751

4852
/label ~feature

‎.license_encryption_key.pub

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
-----BEGIN PUBLIC KEY-----
2+
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Hxv3MkkZbMrKtIs6np9
3+
ccP4OwGBkNhIvhPjcQP48hbbascv5RqsOquQGrYSD2ZrE/kbkRdkIcoHEeTZLif+
4+
bDKFZFI7o5x0H92o9/GSvxHJhQ8mkmvwxD7lssGShwZEm8WG+U7BZqUV/gGmCDqe
5+
9W8H8Fq2B0ck8IXjbQ4Zz+JlyV/NHZTZcs69plFiLKh4N6GYVftOVwSomh0bbypP
6+
OB9WnLC7RC9a2LRrhtf8sqa2rRFmtyMMfgFFzLMzS+w+1K4+QLnWP1gKQVzaFnzk
7+
pnwKPrqbGFYbRztIVEWbs8jPYlLkGb8ME4C84YVtQgbQcbyisU/VW3wUGkhT+J0k
8+
xwIDAQAB
9+
-----END PUBLIC KEY-----

‎.rubocop.yml

+7
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,15 @@ RSpec/BeSuccessMatcher:
275275
- 'ee/spec/support/shared_examples/controllers/**/*'
276276
- 'spec/support/controllers/**/*'
277277
- 'ee/spec/support/controllers/**/*'
278+
278279
Scalability/FileUploads:
279280
Enabled: true
280281
Include:
281282
- 'lib/api/**/*.rb'
282283
- 'ee/lib/api/**/*.rb'
284+
285+
Graphql/Descriptions:
286+
Enabled: true
287+
Include:
288+
- 'app/graphql/**/*'
289+
- 'ee/app/graphql/**/*'

0 commit comments

Comments
 (0)