summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix #down implementationsh-enforce-not-nullStan Hu2018-05-121-1/+1
* Merge branch 'master' into sh-enforce-not-nullStan Hu2018-05-121-5/+0
|\
| * Merge branch 'rd-remove-duplicate-method' into 'master'Robert Speicher2018-05-111-5/+0
| |\
| | * Remove duplicate methodRubén Dávila2018-05-101-5/+0
* | | Fix failing specs in spec/models/guest_spec.rbStan Hu2018-05-121-3/+3
* | | Fix project import failing on null project_featureStan Hu2018-05-121-1/+1
* | | Make project_features.project_id non-NULLStan Hu2018-05-112-2/+23
* | | Delete in batches of 1000Stan Hu2018-05-111-1/+4
* | | Move migration to post-deployment migrationStan Hu2018-05-112-1/+1
* | | Add a unique constraint on the project_features.project_id columnStan Hu2018-05-114-2/+96
|/ /
* | Merge branch 'bvl-fix-sign-out-on-terms' into 'master'Nick Thomas2018-05-112-2/+25
|\ \
| * | Allow a user to sign out when on the terms pageBob Van Landuyt2018-05-112-2/+25
* | | 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-117-131/+65
|\ \ \
| * | | Replace `features/project/merge_requests/references.featue`blackst0ne-replace-spinach-project-merge-requests-references.featureblackst0ne2018-05-106-131/+60
| * | | Add changelog entry [ci skip]blackst0ne2018-05-101-0/+5
* | | | Merge branch 'docs/microsoft-teams' into 'master'Lin Jen-Shin2018-05-111-3/+3
|\ \ \ \
| * | | | Merge branch 'docs-fixed-typo-microsoft-teams-slug' into 'master'Achilleas Pipinellis2018-05-111-3/+3
|/ / / /
* | | | Merge branch 'bvl-terms-redirect-loop' into 'master'Douwe Maan2018-05-112-0/+106
|\ \ \ \
| * | | | Enforce terms acceptance before other requirementsBob Van Landuyt2018-05-112-0/+106
| | |/ / | |/| |
* | | | Merge branch 'bvl-restrict-api-git-for-terms' into 'master'Douwe Maan2018-05-1115-28/+429
|\ \ \ \
| * | | | Allow triggered builds git accessBob Van Landuyt2018-05-115-1/+109
| * | | | Allows `access_(git|api)` to anonymous usersBob Van Landuyt2018-05-102-19/+43
| * | | | Block access to API & git when terms are enforcedBob Van Landuyt2018-05-1012-21/+290
* | | | | Merge branch 'vendor-auto-devops-template' into 'master'Kamil Trzciński2018-05-111-36/+18
|\ \ \ \ \
| * | | | | Vendor Auto DevOps templateFabio Busatto2018-05-111-36/+18
|/ / / / /
* | | | | Merge branch '45715-remove-modal-retry' into 'master'Phil Hughes2018-05-119-241/+124
|\ \ \ \ \
| * | | | | Resolve "Remove modal box confirmation when retrying a pipeline"Filipa Lacerda2018-05-119-241/+124
|/ / / / /
* | | | | Merge branch 'zj-remove-repo-path-strip-storage-path' into 'master'Douwe Maan2018-05-112-36/+2
|\ \ \ \ \
| * | | | | Remove Gitlab::RepoPath.strip_storage_pathZeger-Jan van de Weg2018-05-112-36/+2
* | | | | | Merge branch 'dz-add-2fa-filter' into 'master'Douwe Maan2018-05-118-15/+115
|\ \ \ \ \ \
| * | | | | | Add 2FA filter to group members pageDmitriy Zaporozhets2018-05-108-15/+115
* | | | | | | Merge branch 'zj-wiki-find-file-opt-out' into 'master'Douwe Maan2018-05-112-1/+7
|\ \ \ \ \ \ \
| * | | | | | | Wiki Find Page to opt_outZeger-Jan van de Weg2018-05-112-1/+7
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'blackst0ne-rails5-bump-rails5-to-5-0-7' into 'master'Douwe Maan2018-05-112-63/+59
|\ \ \ \ \ \ \
| * | | | | | | [Rails5] Bump Rails to 5.0.7 and set `atomic` to 1.1.99blackst0ne-rails5-bump-rails5-to-5-0-7blackst0ne2018-05-112-63/+59
| |/ / / / / /
* | | | | | | Merge branch '46233-rails5-fix-nomethoderror-undefined-method-for-3-string' i...Douwe Maan2018-05-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [Rails5] Fix `per_page` in lib/gitlab/multi_collection_paginator.rb46233-rails5-fix-nomethoderror-undefined-method-for-3-stringblackst0ne2018-05-111-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'blackst0ne-rails5-fix-route-source-can-t-be-blank' into 'master'Douwe Maan2018-05-111-1/+3
|\ \ \ \ \ \ \
| * | | | | | | [Rails5] Fix `Route source can't be blank`blackst0ne-rails5-fix-route-source-can-t-be-blankblackst0ne2018-05-111-1/+3
| |/ / / / / /
* | | | | | | Merge branch '46225-rails5-fix-app-views-groups-issues-html-haml' into 'master'Douwe Maan2018-05-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [Rails5] Fix app/views/groups/issues.html.haml46225-rails5-fix-app-views-groups-issues-html-hamlblackst0ne2018-05-111-1/+1
| |/ / / / / /
* | | | | | | Merge branch '5710-add-contact-sales-option-for-epics' into 'master'Tim Zallmann2018-05-111-3/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Support `js-close` as a removal class in UserCalloutLukas Eipert2018-05-111-3/+6
|/ / / / / /
* | | | | | Merge branch 'ide-mr-open-file-fix' into 'master'Filipa Lacerda2018-05-113-2/+27
|\ \ \ \ \ \
| * | | | | | Fixed none merge request files not being openable in the web IDEPhil Hughes2018-05-103-2/+27
| | |_|/ / / | |/| | | |
* | | | | | 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