summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update Auto-DevOps-template Environment Variablesmc-gitlab-ce-magic7s-update-Auto-DevOps-templateBrad Downey2019-03-053-6/+13
* Add new Environment Variable in AutoDev-Ops-templateBrad2019-03-051-0/+6
* Merge branch 'check_pg_stat_activity' into 'master'Stan Hu2019-03-051-0/+19
|\
| * Show pg_stat_activity before each test runThong Kuah2019-03-051-0/+19
* | Merge branch '56809-graphql-version-api' into 'master'Douwe Maan2019-03-0514-5/+171
|\ \
| * | Apply suggestion to spec/graphql/types/query_type_spec.rbDouwe Maan2019-03-051-1/+1
| * | Add metadata about the GitLab server to GraphQLNick Thomas2019-03-0514-5/+171
* | | Merge branch '58390-jest-coverage-analysis-is-failing-on-master' into 'master'Filipa Lacerda2019-03-053-0/+13
|\ \ \
| * | | Re-add babel plugins for dynamic importsLukas Eipert2019-03-053-0/+13
* | | | Merge branch 'security-id-fix-mr-visibility' into 'master'Yorick Peterse2019-03-057-213/+335
|\ \ \ \ | |_|/ / |/| | |
| * | | Display the correct number of MRs a user has access toIgor Drozdov2019-03-057-213/+335
|/ / /
* | | Merge branch 'enable-markup-highlighting' into 'master'Douwe Maan2019-03-052-1/+7
|\ \ \
| * | | Add SyntaxHighlightFilter to markup pipelineMartin Wortschack2019-03-052-1/+7
|/ / /
* | | Merge branch 'winh-revert-34293b5af83' into 'master'Kushal Pandya2019-03-053-44/+11
|\ \ \
| * | | Revert "Merge branch 'gitlab-ui-visual' into 'master'"Winnie Hellmann2019-03-053-44/+11
|/ / /
* | | Merge branch 'add_ldap_tls_options' into 'master'Douwe Maan2019-03-058-53/+307
|\ \ \
| * | | Allow raw `tls_options` to be passed in LDAP configurationDrew Blessing2019-03-048-53/+307
* | | | Merge branch 'docs-anchors8-dev' into 'master'Marcia Ramos2019-03-0511-37/+24
|\ \ \ \
| * | | | Docs: Fix broken anchors in development docsMarcel Amirault2019-03-0511-37/+24
|/ / / /
* | | | Merge branch 'docs-anchors10-user' into 'master'Marcia Ramos2019-03-0516-26/+26
|\ \ \ \
| * | | | Docs: Fix all anchors in /user docsMarcel Amirault2019-03-0516-26/+26
|/ / / /
* | | | Merge branch '58529-fix-specs' into 'master'Rémy Coutable2019-03-051-1/+1
|\ \ \ \
| * | | | Make sure MR and milestone projects are sameJarka Košanová2019-03-051-1/+1
* | | | | Merge dev.gitlab.org master into GitLab.com masterYorick Peterse2019-03-054-4/+112
|\ \ \ \ \
| * \ \ \ \ Merge branch 'security-2774-milestones-detail' into 'master'Yorick Peterse2019-03-054-4/+112
| |\ \ \ \ \
| | * | | | | Display only informaton visible to current userJarka Košanová2019-03-054-4/+112
| |/ / / / /
* | | | | | Merge branch 'table-fix-scroll-and-block' into 'master'Annabel Dunstone Gray2019-03-052-6/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix large table horizontal scroll and prevent side-by-side tablesDany Jupille2019-03-052-6/+6
|/ / / / /
* | | | | Merge branch 'revert-2dcbc0fa' into 'master'Phil Hughes2019-03-054-134/+85
|\ \ \ \ \
| * | | | | Revert "Merge branch 'winh-dequarantine-labels-autocomplete' into 'master'"Winnie Hellmann2019-03-054-134/+85
|/ / / / /
* | | | | Merge branch 'merge-dev-to-master' into 'master'John Jarvis2019-03-05131-448/+1571
|\ \ \ \ \
| * | | | | Resolve conflicts in group policyMałgorzata Ksionek2019-03-052-3/+2
| * | | | | Add frozen_string_literal to new filesStan Hu2019-03-043-0/+6
| * | | | | Resolve conflicts in spec/policies/group_policy_spec.rbStan Hu2019-03-041-12/+0
| * | | | | Resolve conflicts in spec/mailers/notify_spec.rbStan Hu2019-03-041-10/+0
| * | | | | Resolve conflicts in app/policies/group_policy.rbStan Hu2019-03-041-3/+0
| * | | | | Merge dev master into GitLab.com masterYorick Peterse2019-03-04131-434/+1577
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'security-2773-milestones-fix' into 'master'Yorick Peterse2019-03-0419-73/+187
| | |\ \ \ \
| | | * | | | Check issue milestone availabilityJarka Košanová2019-02-1419-73/+187
| | * | | | | Merge branch 'security-commit-private-related-mr' into 'master'Yorick Peterse2019-03-046-6/+65
| | |\ \ \ \ \
| | | * | | | | Add changelog for security fixPatrick Bajao2019-01-281-0/+5
| | | * | | | | Modify MergeRequestsFinder to allow filtering by commitPatrick Bajao2019-01-284-4/+45
| | | * | | | | Respond with 403 when non-member requests for private MRsPatrick Bajao2019-01-282-2/+15
| | * | | | | | Merge branch 'security-id-restricted-access-to-private-repo' into 'master'Yorick Peterse2019-03-045-60/+137
| | |\ \ \ \ \ \
| | | * | | | | | Forbid creating discussions for users with restricted accessIgor Drozdov2019-03-045-60/+137
| | |/ / / / / /
| | * | | | | | Merge branch 'security-protect-private-repo-information' into 'master'Yorick Peterse2019-03-046-22/+85
| | |\ \ \ \ \ \
| | | * | | | | | Add changelog entryLuke Duncalfe2019-02-211-0/+5
| | | * | | | | | Removing sensitive properties from ProjectTypeLuke Duncalfe2019-02-181-2/+0
| | | * | | | | | Prevent leaking of private repo data through APILuke Duncalfe2019-02-184-20/+80
| | * | | | | | | Merge branch 'security-tags-oracle' into 'master'Yorick Peterse2019-03-043-0/+23
| | |\ \ \ \ \ \ \