summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-2817-136/+610
|\
| * Merge branch 'slash-commands-changes-for-chatops' into 'master'Kamil Trzciński2018-02-271-0/+20
| |\
| | * Expose ChatName objects to slash commandsslash-commands-changes-for-chatopsYorick Peterse2018-02-231-0/+20
| * | Merge branch '43275-improve-variables-validation-message' into 'master'Kamil Trzciński2018-02-272-2/+2
| |\ \
| | * | Include CI Variable Key in its uniqueness validation error message43275-improve-variables-validation-messageMatija Čupić2018-02-232-2/+2
| * | | Backport custom metrics ce componentsPaweł Chojnacki2018-02-231-4/+4
| * | | Add DNS verification to Pages custom domainsNick Thomas2018-02-231-2/+142
| * | | Merge branch 'bvl-external-auth-port' into 'master'Douwe Maan2018-02-235-11/+188
| |\ \ \ | | |/ / | |/| |
| | * | Port `read_cross_project` ability from EEBob Van Landuyt2018-02-225-11/+188
| | |/
| * | Change cache index delimiter to character not recognizable as variable partTomasz Maczukin2018-02-211-1/+1
| |/
| * Merge branch 'sh-guard-read-only-user-updates' into 'master'Nick Thomas2018-02-191-0/+8
| |\
| | * Don't attempt to update user tracked fields if database is in read-onlysh-guard-read-only-user-updatesStan Hu2018-02-171-0/+8
| * | Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' i...Douwe Maan2018-02-191-7/+29
| |\ \ | | |/ | |/|
| | * Validate SSH keys through the sshkey gemrd-40552-gitlab-should-check-if-keys-are-valid-before-savingRubén Dávila2018-02-161-18/+3
| | * Revert "Merge branch 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-u...Rubén Dávila2018-02-151-7/+44
| * | Merge branch 'change/strip-whitespace-from-username-input#42637' into 'master'Rémy Coutable2018-02-151-0/+8
| |\ \
| | * | Strip whitespace from username/login value for user lookupPeter Lauck2018-02-131-0/+8
| | |/
| * | Merge branch 'sh-fix-error-500-licensee' into 'master'Douwe Maan2018-02-151-0/+12
| |\ \
| | * | Simplify license generator error handlingStan Hu2018-02-141-3/+2
| | * | Fix Error 500s loading repositories with no master branchStan Hu2018-02-141-0/+13
| | |/
| * | Fixed user synced attributes metadata after removing current providerFrancisco Javier López2018-02-151-0/+33
| |/
| * Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-s...rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-keyRubén Dávila2018-02-121-44/+7
| * Merge branch '40994-fix-ee-ce-compatible-test' into 'master'Kamil Trzciński2018-02-121-1/+1
| |\
| | * Make GITLAB_FEATURES in build_spec compatible with EE40994-fix-ee-ce-compatible-testDylan Griffith2018-02-091-1/+1
| * | Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4'Kamil Trzciński2018-02-093-8/+16
| |/
| * Merge branch '40744-hashed-storage-specs' into 'master'Sean McGivern2018-02-082-89/+148
| |\
| | * Use hashed storage in the specs40744-hashed-storage-specsNick Thomas2018-02-072-89/+148
| * | Merge branch 'feature/oidc-groups-claim' into 'master'Douwe Maan2018-02-081-1/+24
| |\ \
| | * | Add groups to OpenID Connect claimsHassan Zamani2018-02-081-1/+24
| * | | Merge branch '40994-expose-features-as-ci-cd-variable' into 'master'Kamil Trzciński2018-02-081-0/+1
| |\ \ \
| | * | | Expose GITLAB_FEATURES as CI/CD variable (fixes #40994)40994-expose-features-as-ci-cd-variableDylan Griffith2018-02-071-0/+1
* | | | | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-2822-155/+1088
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-072-10/+299
| |\ \ \ \
| | * | | | Make prometheus service querying approach much nicer wrt to arity and default...Pawel Chojnacki2018-02-071-0/+19
| | * | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-0616-145/+425
| | |\ \ \ \
| | * | | | | fix tests for find or initialize service 'prometheus'Pawel Chojnacki2018-02-061-1/+1
| | * | | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-315-10/+55
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-2918-75/+318
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-1720-130/+819
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix rubocop warningsPawel Chojnacki2018-01-042-9/+12
| | * | | | | | | | Test Prometheus proxy client generationPawel Chojnacki2018-01-041-0/+51
| | * | | | | | | | add tests for Manual configuration override and service activation synchroniz...Pawel Chojnacki2018-01-041-0/+66
| | * | | | | | | | Cleanup PrometheusService testsPawel Chojnacki2018-01-041-33/+38
| | * | | | | | | | Cleanup implementation and add cluster finding testsPawel Chojnacki2018-01-041-0/+127
| | * | | | | | | | Add test checking if prometheus integration is enabled after prometheus is in...Pawel Chojnacki2018-01-041-0/+18
| * | | | | | | | | Removing gitaly flagsFrancisco Javier López2018-02-071-105/+124
| * | | | | | | | | Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-apiRubén Dávila2018-02-073-0/+80
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch '38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-wh...Kamil Trzciński2018-02-072-12/+135
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix RedisCacheable#cache_attributes spec38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-when-per-job-timeout-is-more-than-an-hourMatija Čupić2018-02-061-6/+2
| | * | | | | | | | Check return value in RedisCacheable#cached_attribute specMatija Čupić2018-02-061-3/+8