summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ce-5968-extract-ee-specific-files-lines-for-clusters-related-fi...Kamil Trzciński2018-05-154-65/+65
|\
| * Extract shared components from Clusters::CreateService specMatija Čupić2018-05-132-63/+62
| * Add missing spec line from EEMatija Čupić2018-05-131-0/+1
| * Backport cluster factory changes from EEMatija Čupić2018-05-131-2/+2
* | Merge branch 'update-wiki-modal' into 'master'Tim Zallmann2018-05-151-1/+2
|\ \
| * | Fixed linit errorsConstance Okoghenun2018-05-071-1/+1
| * | Updated user delete wiki specConstance Okoghenun2018-05-041-2/+3
* | | Enable update_(build|pipeline) for maintainersJan Provaznik2018-05-155-9/+68
* | | Merge branch 'backstage/gb/backport-untrusted-regexp-ee-code' into 'master'Rémy Coutable2018-05-141-0/+8
|\ \ \
| * | | Backport EE-specific untrusted regexp implementationGrzegorz Bizon2018-05-141-0/+8
* | | | Merge branch 'sh-fix-cross-site-origin-uploads-js' into 'master'Rémy Coutable2018-05-141-0/+15
|\ \ \ \
| * | | | Fix cross-origin errors when attempting to download JavaScript attachmentsStan Hu2018-05-131-0/+15
| | |_|/ | |/| |
* | | | Merge branch '45462-sha-object' into 'master'Phil Hughes2018-05-142-41/+1
|\ \ \ \
| * | | | Moves mr widget to a vue componentFilipa Lacerda2018-05-102-41/+1
* | | | | Merge branch 'kp-add-vue-create-component-helper' into 'master'Filipa Lacerda2018-05-141-3/+19
|\ \ \ \ \
| * | | | | Add `createComponentWithMixin` to create anonymous components with mixinKushal Pandya2018-05-141-3/+19
* | | | | | Merge branch 'sh-fix-blocked-user-account-ldap' into 'master'Douwe Maan2018-05-141-17/+27
|\ \ \ \ \ \
| * | | | | | Fix system hook not firing for blocked users when LDAP sign-in is usedStan Hu2018-05-121-17/+27
| | |_|/ / / | |/| | | |
* | | | | | Fix gitaly-ruby bundle poisoning in CIJacob Vosmaer (out of office May 10-14)2018-05-141-1/+5
* | | | | | Replace the `project/forked_merge_requests.feature` spinach test with an rspe...blackst0ne2018-05-141-14/+66
| |/ / / / |/| | | |
* | | | | Replace the `project/commits/diff_comments.feature` spinach test with an rspe...blackst0ne2018-05-144-110/+249
|/ / / /
* | | | Merge branch 'bvl-fix-sign-out-on-terms' into 'master'Nick Thomas2018-05-111-0/+18
|\ \ \ \
| * | | | Allow a user to sign out when on the terms pageBob Van Landuyt2018-05-111-0/+18
* | | | | Merge branch 'b-rails5-fix-spec-controllers-projects-jobs_controller_spec-rb'...Robert Speicher2018-05-111-12/+12
|\ \ \ \ \
| * | | | | [Rails5] Fix spec/controllers/projects/jobs_controller_spec.rbb-rails5-fix-spec-controllers-projects-jobs_controller_spec-rbblackst0ne2018-05-111-12/+12
| |/ / / /
* | | | | Merge branch 'blackst0ne-replace-spinach-project-merge-requests-references.fe...Robert Speicher2018-05-111-0/+60
|\ \ \ \ \
| * | | | | Replace `features/project/merge_requests/references.featue`blackst0ne-replace-spinach-project-merge-requests-references.featureblackst0ne2018-05-101-0/+60
* | | | | | Merge branch 'bvl-terms-redirect-loop' into 'master'Douwe Maan2018-05-111-0/+102
|\ \ \ \ \ \
| * | | | | | Enforce terms acceptance before other requirementsBob Van Landuyt2018-05-111-0/+102
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'bvl-restrict-api-git-for-terms' into 'master'Douwe Maan2018-05-117-1/+338
|\ \ \ \ \ \
| * | | | | | Allow triggered builds git accessBob Van Landuyt2018-05-113-0/+92
| * | | | | | Allows `access_(git|api)` to anonymous usersBob Van Landuyt2018-05-101-13/+39
| * | | | | | Block access to API & git when terms are enforcedBob Van Landuyt2018-05-105-1/+220
| | |_|/ / / | |/| | | |
* | | | | | Resolve "Remove modal box confirmation when retrying a pipeline"Filipa Lacerda2018-05-113-69/+31
* | | | | | Merge branch 'zj-remove-repo-path-strip-storage-path' into 'master'Douwe Maan2018-05-111-19/+0
|\ \ \ \ \ \
| * | | | | | Remove Gitlab::RepoPath.strip_storage_pathZeger-Jan van de Weg2018-05-111-19/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'dz-add-2fa-filter' into 'master'Douwe Maan2018-05-111-0/+54
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add 2FA filter to group members pageDmitriy Zaporozhets2018-05-101-0/+54
* | | | | | Merge branch 'ide-mr-open-file-fix' into 'master'Filipa Lacerda2018-05-111-1/+25
|\ \ \ \ \ \
| * | | | | | Fixed none merge request files not being openable in the web IDEPhil Hughes2018-05-101-1/+25
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ce-5911-extract-ee-specific-files-lines-for-spec-models-cluster...Kamil Trzciński2018-05-113-11/+73
|\ \ \ \ \ \
| * | | | | | Backport CE changes from gitlab-ee#518a29073a9Matija Čupić2018-05-101-2/+2
| * | | | | | Stub deployments in Clusters::Platforms::Kubernetes specMatija Čupić2018-05-101-1/+4
| * | | | | | Backport KubernetesHelper deployment related changesMatija Čupić2018-05-101-3/+66
| * | | | | | Backport EE runner spec changes to CEMatija Čupić2018-05-101-5/+1
* | | | | | | Merge branch 'zj-validation-initializer' into 'master'Kamil Trzciński2018-05-112-20/+29
|\ \ \ \ \ \ \
| * | | | | | | Remove method call to deprecated methodZeger-Jan van de Weg2018-05-112-20/+29
* | | | | | | | Merge branch 'correct-runner-type-when-assigning-shared-to-project' into 'mas...Kamil Trzciński2018-05-111-6/+20
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Ensure Ci::Runner#assign_to errors for group runnerscorrect-runner-type-when-assigning-shared-to-projectDylan Griffith2018-05-101-7/+20
| * | | | | | | Ensure runner_type is updated correctly when assigning shared runner to projectDylan Griffith2018-05-101-0/+1