summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | Merge branch 'bw-fix-sha-attribute' into 'master'Stan Hu2018-05-101-4/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | only issue a warning if column doesn't existBrett Walker2018-05-101-4/+6
* | | | | | | Merge branch 'fix/wiki-find-page-invalid-encoding' into 'master'Robert Speicher2018-05-101-0/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix finding wiki pages when they have invalidly-encoded contentAhmad Sherif2018-05-091-0/+11
| |/ / / / /
* | | | | | Merge branch 'ide-hide-merge-request-if-disabled' into 'master'Filipa Lacerda2018-05-103-0/+18
|\ \ \ \ \ \
| * | | | | | fixed specsPhil Hughes2018-05-102-7/+4
| * | | | | | Hide merge request option in IDE when merge requests are disabledPhil Hughes2018-05-092-0/+21
| |/ / / / /
* | | | | | Merge branch 'sh-reset-prometheus-metrics-tests' into 'master'Nick Thomas2018-05-102-0/+25
|\ \ \ \ \ \
| * | | | | | Support resetting of Prometheus metrics between test runsStan Hu2018-05-092-0/+25
* | | | | | | Merge branch '45442-updates-updated-at-to-issue-on-time-spent' into 'master'Douwe Maan2018-05-102-9/+37
|\ \ \ \ \ \ \
| * | | | | | | Updates updated_at on issue when using /spend quick actionJacopo2018-05-092-9/+37
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'ce-jej/group-saml-skip-forgery-protection' into 'master'Douwe Maan2018-05-101-5/+12
|\ \ \ \ \ \ \
| * | | | | | | Backport with_forgery_protection spec helperJames Edwards-Jones2018-05-081-5/+12
* | | | | | | | Merge branch 'backport-rd-5566-improve-performance-of-repository-size-limit-c...Douwe Maan2018-05-102-1/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Backport some changes from gitlab-ee!5476Rubén Dávila2018-05-092-1/+21
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '46147-remove-model-redefinition-worker' into 'master'Douwe Maan2018-05-101-70/+95
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | apply feedbackMicaël Bergeron2018-05-091-3/+3
| * | | | | | | remove the `Upload` redefinition in `MigrateUploadsWorker`Micaël Bergeron2018-05-081-70/+95
* | | | | | | | Replace the `project/issues/references.feature` spinach test with an rspec an...blackst0ne2018-05-093-193/+267
* | | | | | | | Replace the `project/deploy_keys.feature` spinach test with an rspec analogblackst0ne2018-05-091-0/+125
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'dm-repository-xcode-project' into 'master'Robert Speicher2018-05-091-1/+32
|\ \ \ \ \ \ \
View Lorry Controller Status