summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '62722-boot-app-in-ci-and-check-memory' into 'master'Kamil Trzciński2019-06-284-5/+40
|\
| * Get memory data after booting app in production62722-boot-app-in-ci-and-check-memoryAleksei Lipniagov2019-06-284-5/+40
* | Merge branch 'awgeorge1/gitlab-ee-6249-related-quick-action-docs' into 'master'Bob Van Landuyt2019-06-281-0/+1
|\ \
| * | Backport docs about /relate quick actionawgeorge1/gitlab-ee-6249-related-quick-action-docsToon Claes2019-06-271-0/+1
* | | Merge branch 'ee-issue/11039' into 'master'Filipa Lacerda2019-06-282-0/+6
|\ \ \
| * | | added code difference in `app/views/search/_category.html.haml` from EE to CEMichel Engelen2019-06-282-0/+6
|/ / /
* | | Merge branch '3264-project-aliases-ce' into 'master'Bob Van Landuyt2019-06-287-0/+162
|\ \ \ | |_|/ |/| |
| * | Add @patrickbajao as codeowner of project aliases3264-project-aliases-cePatrick Bajao2019-06-271-0/+2
| * | Specify feature was added in GitLab PremiumPatrick Bajao2019-06-262-2/+2
| * | Add project_aliases to be imported/exportedPatrick Bajao2019-06-261-0/+1
| * | Update related documentationPatrick Bajao2019-06-263-16/+35
| * | Add documentation for feature and APIPatrick Bajao2019-06-262-0/+114
| * | Create project_aliases tablePatrick Bajao2019-06-262-0/+26
* | | Merge branch 'set-higher-ttl-for-trace-write' into 'master'Kamil Trzciński2019-06-283-2/+7
|\ \ \
| * | | Set higher TTL to write lock for tracesset-higher-ttl-for-trace-writeShinya Maeda2019-06-283-2/+7
* | | | Merge branch 'docs/secure-maintenance' into 'master'Marcia Ramos2019-06-285-5/+48
|\ \ \ \
| * | | | Document the security tools maintenance and vulnerabilities DB updatedocs/secure-maintenanceAchilleas Pipinellis2019-06-265-5/+48
* | | | | Merge branch 'sh-support-subnets-ip-rate-limiter' into 'master'Thong Kuah2019-06-285-3/+94
|\ \ \ \ \
| * | | | | Support CIDR notation in IP rate limitersh-support-subnets-ip-rate-limiterStan Hu2019-06-275-3/+94
* | | | | | Merge branch 'graphql-tree-last-commit' into 'master'Lin Jen-Shin2019-06-2812-3/+139
|\ \ \ \ \ \
| * | | | | | Added commit type to tree GraphQL typePhil Hughes2019-06-2812-3/+139
* | | | | | | Merge branch 'id-extract-widget-into-different-request' into 'master'Ash McKenzie2019-06-2812-14/+111
|\ \ \ \ \ \ \
| * | | | | | | Extract MR's widget into a separate endpointid-extract-widget-into-different-requestIgor Drozdov2019-06-2812-14/+111
* | | | | | | | Merge branch '44949-do-not-update-updated_at-on-an-issue-when-reordering-it' ...Douwe Maan2019-06-284-13/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | Do not change updated_at on an issue when reordering on an issue boardEugenia Grieff2019-06-284-13/+71
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-fix-issue-12303' into 'master'Grzegorz Bizon2019-06-281-1/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Backport CE changes for multiple GroupSAML supportsh-fix-issue-12303Stan Hu2019-06-271-1/+9
* | | | | | | | | Merge branch '62968-environment-details-header-border-misaligned' into 'master'Kushal Pandya2019-06-282-15/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Align page header for environment details view62968-environment-details-header-border-misalignedDave Pisek2019-06-282-15/+18
* | | | | | | | | | Merge branch 'ce-11098-update-merge-request-settings-description-text' into '...Filipa Lacerda2019-06-284-4/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update project MR setting section description (CE)Nathan Friend2019-06-254-4/+10
* | | | | | | | | | | Merge branch '6360-tree-header' into 'master'Phil Hughes2019-06-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Removes EE differences6360-tree-headerFilipa Lacerda2019-06-271-0/+1
* | | | | | | | | | | | Merge branch 'docs/edit-cluster-admin-note-text' into 'master'Achilleas Pipinellis2019-06-281-10/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Edit Cluster Admin note textEvan Read2019-06-281-10/+8
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch '63212-n-1-queries-in-projects-id-boards-api' into 'master'Thong Kuah2019-06-287-5/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move order lambda to list scope63212-n-1-queries-in-projects-id-boards-apicharlieablett2019-06-272-2/+3
| * | | | | | | | | | | | Compound lists scopes to preserve orderingcharlieablett2019-06-261-1/+1
| * | | | | | | | | | | | Remove `with_associations` from BoardSerializercharlieablett2019-06-261-8/+0
| * | | | | | | | | | | | Remove N+1 query for project and group boardscharlieablett2019-06-267-4/+25
* | | | | | | | | | | | | Merge branch 'vue-i18n-js-performance-bar-directory' into 'master'Kushal Pandya2019-06-283-7/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Namespace performance bar translationsvue-i18n-js-performance-bar-directoryEzekiel Kigbo2019-06-283-19/+24
| * | | | | | | | | | | | | Vue-i18n: app/assets/javascripts/performance_bar/ directoryEzekiel Kigbo2019-06-272-6/+20
* | | | | | | | | | | | | | Merge branch 'docs/add-docs-site-arch-diagram' into 'master'Achilleas Pipinellis2019-06-281-5/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add diagram to site architecture docsEvan Read2019-06-281-5/+37
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '62826-graphql-emoji-mutations' into 'master'Jan Provaznik2019-06-2825-6/+745
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | GraphQL mutations for add, remove and toggle emoji62826-graphql-emoji-mutationsLuke Duncalfe2019-06-2825-6/+745
* | | | | | | | | | | | | | | Merge branch '58689-regroup-jump-button-in-discussion' into 'master'Phil Hughes2019-06-287-22/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Rearrange discussion resolve buttons & update button displaySamantha Ming2019-06-287-22/+54
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'support-jsonb-default-value' into 'master'Thong Kuah2019-06-283-1/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |