summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-08-051-2/+0
|\
| * Revert "Merge branch 'backport-fix-remaining-prepend-lines' into 'master'"Mark Lapierre2019-08-051-2/+0
* | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-08-021-0/+2
|\ \ | |/
| * Merge branch 'backport-fix-remaining-prepend-lines' into 'master'Robert Speicher2019-08-021-0/+2
| |\
| | * Support X_if_ee methods for QA testsbackport-fix-remaining-prepend-linesYorick Peterse2019-08-011-0/+2
* | | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-08-021-1/+6
|\ \ \ | |/ /
| * | Call `GC::Profiler.clear` only in one placeAleksei Lipniagov2019-08-021-1/+6
| * | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3809ce-docker_image_replicationValery Sizov2019-08-013-0/+15
| |/
* | Docker Registry replication for GeoValery Sizov2019-08-013-0/+15
* | Refactor designs routeLuke Duncalfe2019-08-011-0/+4
* | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-07-311-0/+64
|\ \ | |/
| * Allow knative do be uninstalled:João Cunha2019-07-311-0/+64
* | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-07-311-0/+14
|\ \ | |/
| * Merge branch 'mg-update-icons-svg-import' into 'master'Kushal Pandya2019-07-311-0/+14
| |\
| | * Override icons.svg asset path with sprockets assetmg-update-icons-svg-importMike Greiling2019-07-291-0/+6
| | * Use file-loader to import icon spritesMike Greiling2019-07-291-0/+8
| * | Add methods for injecting EE modulesYorick Peterse2019-07-301-0/+17
* | | Inject EE modules in a CE compatible fashionYorick Peterse2019-07-301-1/+1
* | | Add methods for injecting EE modulesYorick Peterse2019-07-301-0/+17
* | | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-07-301-1/+0
|\ \ \ | |/ /
| * | Remove line profiler from performance barSean McGivern2019-07-301-1/+0
* | | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-07-291-0/+8
|\ \ \ | |/ /
| * | Merge branch 'sh-add-cmaps-for-pdfjs' into 'master'Mike Greiling2019-07-291-0/+8
| |\ \
| | * | Make pdf.js render CJK characterssh-add-cmaps-for-pdfjsStan Hu2019-07-281-0/+8
| * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-07-292-5/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'security-github-ssrf-redirect' into 'master'GitLab Release Tools Bot2019-07-261-0/+1
| | |\ \
| | | * | Do not allow localhost url redirection in GitHub Integrationmanojmj2019-07-051-0/+1
| | * | | Merge branch 'security-remove-take-trigger-ownership-feature' into 'master'GitLab Release Tools Bot2019-07-261-5/+1
| | |\ \ \
| | | * | | Drop feature to take ownership of a trigger tokenFabio Pitino2019-07-101-5/+1
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-eeRobert Speicher2019-07-292-5/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'security-github-ssrf-redirect' into 'master'GitLab Release Tools Bot2019-07-261-0/+1
| |\ \ \ \ \ \
| | * | | | | | Do not allow localhost url redirection in GitHub Integrationmanojmj2019-07-091-0/+1
| * | | | | | | Merge branch 'security-remove-take-trigger-ownership-feature-ee' into 'master'GitLab Release Tools Bot2019-07-261-5/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Drop feature to take ownership of a trigger tokenFabio Pitino2019-07-101-5/+1
* | | | | | | | | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-07-291-35/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'remove-peek-pg' into 'master'Stan Hu2019-07-291-35/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Replace peek-pg with our own implementationremove-peek-pgSean McGivern2019-07-261-35/+5
* | | | | | | | | | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-07-291-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Adds direct monitoring for sidekiq metricsRyan Cobb2019-07-291-0/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-07-261-0/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch '19186-redirect-wiki-git-route-to-wiki' into 'master'Stan Hu2019-07-261-0/+12
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Redirect project.wiki.git to project wiki home19186-redirect-wiki-git-route-to-wikiLuke Duncalfe2019-07-261-0/+12
| | |/ / / / / / /
* | | | | | | | | Automatic merge of gitlab-org/gitlab-ce masterGitLab Bot2019-07-262-29/+29
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Updates label value to include units in metricsLaura Montemayor2019-07-262-29/+29
| |/ / / / / / /
| * | | | | | | Remove unneeded monkey-patch54478-table_exists-not-compatible-with-rails-5-1Heinrich Lee Yu2019-07-253-12/+2
| * | | | | | | Merge branch 'ce-docker_image_replication-event-generation' into 'master'Douglas Barbosa Alexandre2019-07-242-0/+10
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14597ce-docker_image_replication-event-generationValery Sizov2019-07-242-0/+10
* | | | | | | | Remove unneeded monkey-patchHeinrich Lee Yu2019-07-253-12/+2
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'docker_image_replication-event-generation' into 'master'Douglas Barbosa Alexandre2019-07-242-0/+10
|\ \ \ \ \ \ \
| * | | | | | | Docker Regitry event handlingValery Sizov2019-07-242-0/+10