summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix typo in specadd-json-responder-for-feature-flag-controllerShinya Maeda2019-01-031-2/+2
* Add spec for finderShinya Maeda2019-01-033-4/+46
* Add spec for serializser and entityShinya Maeda2019-01-032-0/+42
* Add serializer and entity for Feature flagShinya Maeda2019-01-037-4/+121
* Add Json responder in feature flag controllerShinya Maeda2019-01-035-3/+77
* Merge branch 'ee-40270-remove-gitlab-upgrader-completely' into 'master'Lin Jen-Shin2018-12-245-238/+5
|\
| * Remove Gitlab Upgrader found in /lib/gitlab/upgrader.rbJacob Wolen2018-12-245-238/+5
|/
* Merge branch 'fix-geo-ssh-push-secondary-clone-qa' into 'master'Lin Jen-Shin2018-12-246-15/+46
|\
| * Fix wait for project replicationMark Lapierre2018-12-216-15/+46
* | Merge branch 'dz-add-type-to-packages' into 'master'Dmitriy Zaporozhets2018-12-228-1/+62
|\ \
| * | Add package_type column to packages tableDmitriy Zaporozhets2018-12-228-1/+62
* | | Merge branch 'ee-44984-use-serializer-for-issuable-sidebar' into 'master'Mike Greiling2018-12-2160-408/+702
|\ \ \
| * | | EE port of 44984-use-serializer-for-issuable-sidebarHeinrich Lee Yu2018-12-2160-408/+702
* | | | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2018-12-211-2/+2
|\ \ \ \
| * \ \ \ Merge branch 'add-dbalexandre-to-CODEOWNERS' into 'master'Stan Hu2018-12-211-2/+2
| |\ \ \ \
| | * | | | Add @dbalexandre to CODEOWNERSDouglas Barbosa Alexandre2018-12-211-2/+2
| |/ / / /
* | | | | Merge branch 'dz-ee-api-endpoints' into 'master'Dmitriy Zaporozhets2018-12-212-18/+29
|\ \ \ \ \
| * | | | | Move EE-only API endpoints mount to separate fileDmitriy Zaporozhets2018-12-212-18/+29
| | |_|/ / | |/| | |
* | | | | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2018-12-211-2/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'add-jen-shin-to-CODEOWNERS' into 'master'Douglas Barbosa Alexandre2018-12-211-2/+2
| |\ \ \ \
| | * | | | Add @godfat to CODEOWNERSLin Jen-Shin2018-12-221-2/+2
* | | | | | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2018-12-214-38/+67
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'docs-serverless-samples' into 'master'Achilleas Pipinellis2018-12-214-38/+67
| |\ \ \ \ \
| | * | | | | Update verbiage for claritydanielgruesso2018-12-211-3/+3
| | * | | | | Change group-cluster beta to regular noteDaniel Gruesso2018-12-211-3/+1
| | * | | | | Change alpha states to use note instead of warningDaniel Gruesso2018-12-211-3/+1
| | * | | | | Update registry section. Update serverless.yaml formattingdanielgruesso2018-12-211-8/+7
| | * | | | | Clarify obtaining application URLdanielgruesso2018-12-211-8/+3
| | * | | | | Formatting updates for tablesdanielgruesso2018-12-201-16/+17
| | * | | | | Fix indentation for variable descriptiondanielgruesso2018-12-201-1/+1
| | * | | | | Update variable descriptiondanielgruesso2018-12-201-2/+2
| | * | | | | Update table formattingdanielgruesso2018-12-191-24/+24
| | * | | | | Update serverless page to include sample function and template descdanielgruesso2018-12-193-23/+61
| * | | | | | Merge branch 'revert-62d250ff' into 'master'Sean McGivern2018-12-217-58/+10
| |\ \ \ \ \ \
| | * | | | | | Revert "Merge branch 'winh-discussion-header-commented' into 'master'"Winnie Hellmann2018-12-217-58/+10
| | | |/ / / / | | |/| | | |
* | | | | | | Merge branch 'revert-62d250ff-ee' into 'master'Sean McGivern2018-12-218-59/+12
|\ \ \ \ \ \ \
| * | | | | | | Revert "Merge branch 'winh-discussion-header-commented-ee' into 'master'"Winnie Hellmann2018-12-218-59/+12
* | | | | | | | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2018-12-218-43/+120
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch '54781-store-disk-path-in-database-for-projects-on-legacy-storag...Stan Hu2018-12-218-43/+120
| |\ \ \ \ \ \ \
| | * | | | | | | Update storage location after a group has been renamed/transferedDouglas Barbosa Alexandre2018-12-212-23/+32
| | * | | | | | | Update storage location after a project has been transferedDouglas Barbosa Alexandre2018-12-212-3/+24
| | * | | | | | | Update storage location after a project has been renamedDouglas Barbosa Alexandre2018-12-212-0/+21
| | * | | | | | | Track storage location for legacy storage projectsDouglas Barbosa Alexandre2018-12-212-17/+43
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2018-12-215-25/+190
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | |
| * | | | | | Merge branch 'support-gitaly-tls' into 'master'Lin Jen-Shin2018-12-215-25/+190
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | More tls gitaly docsAhmad Hassan2018-12-212-2/+36
| | * | | | | Log certificate loading errors into sentryAhmad Hassan2018-12-202-4/+24
| | * | | | | Followups on reviewAhmad Hassan2018-12-194-45/+40
| | * | | | | Add tls config to gitaly administration docsAhmad Hassan2018-12-181-1/+11
| | * | | | | Deduplicate certificatesAhmad Hassan2018-12-171-3/+13