summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'zj-ref-contains-sha-mandatory' into 'master'Robert Speicher2018-05-161-21/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref contains oid check done by Gitaly Closes gitaly#884 See merge request gitlab-org/gitlab-ce!18944
| * | | | | Ref contains oid check done by GitalyZeger-Jan van de Weg2018-05-141-21/+11
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | These two endpoints are in opt-out, and no one noticed. Has been running on .com for 4 months now and considered stable. Closes https://gitlab.com/gitlab-org/gitaly/issues/884
* | | | | Merge branch 'fix-metrics-content-types' into 'master'Stan Hu2018-05-151-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix setting Gitlab metrics content types Closes gitlab-com/infrastructure#3499 See merge request gitlab-org/gitlab-ce!18975
| * | | | | Fix setting Gitlab metrics content typesYorick Peterse2018-05-151-3/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method "content_type" on a controller does not always return the correct content type. On the other hand, the method "request_format" does _and_ immediately returns a Symbol (e.g. :json) instead of a mime-type name (e.g. application/json). With these changes metrics should again report their action names correctly. Fixes https://gitlab.com/gitlab-com/infrastructure/issues/3499
* | | | | Merge branch '45584-add-nip-io-domain-suggestion-in-auto-devops' into 'master'Grzegorz Bizon2018-05-151-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add nip.io domain suggestion in the Kubernetes cluster details view" Closes #45584 See merge request gitlab-org/gitlab-ce!18496
| * | | | Display help text below auto devops domain with nip.io domain name (#45561)45584-add-nip-io-domain-suggestion-in-auto-devopsDylan Griffith2018-05-151-0/+1
| | |/ / | |/| |
* | | | Disable greedy mode when matching filenameJan Provaznik2018-05-151-0/+12
|/ / /
* | | Merge branch 'backstage/gb/backport-untrusted-regexp-ee-code' into 'master'Rémy Coutable2018-05-141-0/+8
|\ \ \ | | | | | | | | | | | | | | | | Backport EE-specific untrusted regexp implementation See merge request gitlab-org/gitlab-ce!18938
| * | | Backport EE-specific untrusted regexp implementationGrzegorz Bizon2018-05-141-0/+8
| | |/ | |/|
* | | Fix system hook not firing for blocked users when LDAP sign-in is usedStan Hu2018-05-121-17/+27
| |/ |/| | | | | | | | | | | | | | | An LDAP sign-in request results in a different request parameter than a standard GitLab sign-in. Since Warden doesn't pass us the user that was blocked, we first search for a `username` in the request parameters and then look for `user.login`. Closes #46307
* | Merge branch 'bvl-restrict-api-git-for-terms' into 'master'Douwe Maan2018-05-113-1/+150
|\ \ | | | | | | | | | | | | | | | | | | Block access to API & git when terms are enforced Closes #45849 See merge request gitlab-org/gitlab-ce!18816
| * | Allow triggered builds git accessBob Van Landuyt2018-05-112-0/+39
| | | | | | | | | | | | | | | Allow builds that have been triggered by a user before terms were enforced access to git. That way the builds can complete as usual.
| * | Block access to API & git when terms are enforcedBob Van Landuyt2018-05-102-1/+111
| | | | | | | | | | | | | | | | | | When terms are enforced, but the user has not accepted the terms access to the API & git is rejected with a message directing the user to the web app to accept the terms.
* | | Remove Gitlab::RepoPath.strip_storage_pathZeger-Jan van de Weg2018-05-111-19/+0
| |/ |/| | | | | | | | | This used to be executed because of the post receive worker, but this uses Gitlab::GlRepository.parse now. So this removes dead code and reduces the number of calls on `#legacy_storage_path`.
* | Merge branch 'zj-validation-initializer' into 'master'Kamil Trzciński2018-05-111-0/+29
|\ \ | |/ |/| | | | | Remove method call to deprecated method See merge request gitlab-org/gitlab-ce!18815
| * Remove method call to deprecated methodZeger-Jan van de Weg2018-05-111-0/+29
| | | | | | | | | | Given the settings initializer creates Gitaly Storage Settings objects already, the calls to path can be moved to that initializer.
* | Merge branch 'sh-reset-prometheus-metrics-tests' into 'master'Nick Thomas2018-05-101-0/+18
|\ \ | | | | | | | | | | | | | | | | | | Support resetting of Prometheus metrics between test runs Closes #39968 See merge request gitlab-org/gitlab-ce!18836
| * | Support resetting of Prometheus metrics between test runsStan Hu2018-05-091-0/+18
| |/ | | | | | | | | | | | | Adding the :prometheus tag to an rspec test will clear out memory-mapped files and reset the registry. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39968
* | Backport some changes from gitlab-ee!5476Rubén Dávila2018-05-092-1/+21
|/ | | | | The lib/gitlab/git/repository.rb needs to have the same content between gitlab-ce and gitlab-ee in order to have Gitaly working fine.
* Merge branch '5750-backport-checksum-git-commanderror-exit-status-128' into ↵Stan Hu2018-05-081-1/+16
|\ | | | | | | | | | | | | 'master' Raise InvalidRepository error for non-valid git repositories See merge request gitlab-org/gitlab-ce!18594
| * Raise InvalidRepository error for non-valid git repositoriesDouglas Barbosa Alexandre2018-05-071-1/+16
| |
* | Merge branch '5480-epic-notifications-ce' into 'master'Douwe Maan2018-05-076-46/+0
|\ \ | |/ |/| | | | | Backport 5480-epic-notifications from EE See merge request gitlab-org/gitlab-ce!18724
| * Backport 5480-epic-notifications from EEMario de la Ossa2018-05-076-46/+0
| |
* | Merge branch 'ccr/weight_1481' into 'master'Douwe Maan2018-05-071-2/+2
|\ \ | | | | | | | | | | | | Backport of 1481-changing-weight-values-should-trigger-system-notes See merge request gitlab-org/gitlab-ce!18699
| * | Backport of 1481-changing-weight-values-should-trigger-system-notesChantal Rollison2018-05-031-2/+2
| | |
* | | Merge branch '42099-port-push-mirroring-to-ce-ce-port-v-2' into 'master'Douwe Maan2018-05-072-0/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | CE backport of Backports Push Mirrors to CE Closes #42099 See merge request gitlab-org/gitlab-ce!18715
| * | Backports every CE related change from ee-5484 to CETiago Botelho2018-05-072-0/+2
| | |
* | | Client implementation GetRawChangesZeger-Jan van de Weg2018-05-072-25/+46
| | | | | | | | | | | | Part of https://gitlab.com/gitlab-org/gitaly/issues/1138
* | | Bump Gitaly to 0.98.0Zeger-Jan van de Weg2018-05-074-7/+7
| | | | | | | | | | | | | | | | | | Hooks were run for wikis, but given the internal API wasn't responding failures happended, as seen on: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18693
* | | Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-allShinya Maeda2018-05-076-4/+82
|\ \ \
| * \ \ Merge branch 'master' into live-trace-v2Shinya Maeda2018-05-076-4/+82
| |\ \ \ | | |/ /
| | * | Merge branch ↵Kamil Trzciński2018-05-061-1/+8
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui' into 'master' Resolve "Specify variables when executing a manual pipeline from the UI" Closes #44059 See merge request gitlab-org/gitlab-ce!18440
| | | * | Improve variable comparisonMatija Čupić2018-05-041-1/+2
| | | | |
| | | * | Merge branch 'master' into ↵Matija Čupić2018-05-028-84/+101
| | | |\ \ | | | | | | | | | | | | | | | | | | 44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui
| | | * \ \ Merge branch 'master' into ↵Jose2018-04-3029-103/+724
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | 44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui
| | | * | | | Extend Gitlab::Ci::Pipeline::Chain::Command with variables_attributesMatija Čupić2018-04-181-1/+7
| | | | | | |
| | * | | | | Backports every CE related change from ee-44542 to CETiago Botelho2018-05-045-2/+73
| | | | | | |
| | * | | | | Merge branch 'master' into feature/runner-per-groupDylan Griffith2018-05-0312-128/+412
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Merge branch 'master' into siemens-runner-per-groupDylan Griffith2018-04-2614-44/+202
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into siemens-runner-per-groupDylan Griffith2018-04-246-6/+14
| | |\ \ \ \ \ \
| | * | | | | | | update MODELS_JSON with new Project#settings attrAlexis Reigel2018-04-231-1/+1
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-allShinya Maeda2018-05-041-660/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Test trace_spec on both conditions - ci_enable_live_trace is on/offShinya Maeda2018-05-041-660/+6
| | | | | | | |
* | | | | | | | Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-allShinya Maeda2018-05-034-2/+39
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'master' into live-trace-v2Shinya Maeda2018-05-034-2/+39
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge branch 'backstage/gb/migrate-pipeline-stages-index' into 'master'Kamil Trzciński2018-05-024-2/+39
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate pipeline stages indices Closes #43009 See merge request gitlab-org/gitlab-ce!18420
| | | * | | | | | Use stages position column to track stage indexGrzegorz Bizon2018-05-014-5/+5
| | | | | | | | |
| | | * | | | | | Merge branch 'master' into backstage/gb/migrate-pipeline-stages-indexGrzegorz Bizon2018-05-018-82/+354
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | | | | | | | | | * master: (106 commits)
| | | * | | | | | Merge branch 'master' into 'backstage/gb/migrate-pipeline-stages-index'Grzegorz Bizon2018-04-259-6/+159
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | | * | | | | | | Rename stage index column name to priority columnGrzegorz Bizon2018-04-244-5/+5
| | | | | | | | | |