summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch '63479-jira-capitalization' into 'master'Rémy Coutable2019-06-2876-236/+241
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace 'JIRA' with 'Jira' Closes #63479 See merge request gitlab-org/gitlab-ce!29849
| * | | | | | | | Replace 'JIRA' with 'Jira'Takuya Noguchi2019-06-2876-236/+241
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://community.atlassian.com/t5/Jira-questions/Is-it-quot-JIRA-quot-or-quot-Jira-quot/qaq-p/681163 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | 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 production Closes #63585 See merge request gitlab-org/gitlab-ce!30031
| * | | | | | | | Get memory data after booting app in production62722-boot-app-in-ci-and-check-memoryAleksei Lipniagov2019-06-284-5/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preload the app in `production` env, hit it with a single request, and gather total gem memory consumption data using `derailed exec perf:mem` from `derailed_benchmarks`. Present the result as MR metrics.
* | | | | | | | | Merge branch 'awgeorge1/gitlab-ee-6249-related-quick-action-docs' into 'master'Bob Van Landuyt2019-06-281-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Doc backport: Add `/relate` quick action See merge request gitlab-org/gitlab-ce!29803
| * | | | | | | | Backport docs about /relate quick actionawgeorge1/gitlab-ee-6249-related-quick-action-docsToon Claes2019-06-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14257
* | | | | | | | | 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 CE See merge request gitlab-org/gitlab-ce!28755
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14108 See merge request gitlab-org/gitlab-ce!29604
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the newly added documentation to be more precise and fix the typos. Add information about Project aliases into permissions doc.
| * | | | | | | | 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 traces See merge request gitlab-org/gitlab-ce!30064
| * | | | | | | | Set higher TTL to write lock for tracesset-higher-ttl-for-trace-writeShinya Maeda2019-06-283-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set higher TTL is safer option when it comes to long running archive
* | | | | | | | | Merge branch 'docs/secure-maintenance' into 'master'Marcia Ramos2019-06-285-5/+48
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the security tools maintenance and vulnerabilities DB update Closes gitlab-ee#9986 See merge request gitlab-org/gitlab-ce!29840
| * | | | | | | | | Document the security tools maintenance and vulnerabilities DB updatedocs/secure-maintenanceAchilleas Pipinellis2019-06-265-5/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses the following questions: - How often do we update the vulnerability DB or analyzers? - Do we have to update GitLab to benefit from latest vulnerabilities definitions?
* | | | | | | | | | Merge branch 'sh-support-subnets-ip-rate-limiter' into 'master'Thong Kuah2019-06-285-3/+94
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support CIDR notation in IP rate limiter See merge request gitlab-org/gitlab-ce!30146
| * | | | | | | | | | Support CIDR notation in IP rate limitersh-support-subnets-ip-rate-limiterStan Hu2019-06-275-3/+94
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it possible to whitelist multiple IP addresses (e.g. 192.168.0.1/24).
* | | | | | | | | | Merge branch 'graphql-tree-last-commit' into 'master'Lin Jen-Shin2019-06-2812-3/+139
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added commit type to tree GraphQL type See merge request gitlab-org/gitlab-ce!29412
| * | | | | | | | | | 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 request Closes #62723 See merge request gitlab-org/gitlab-ce!29979
| * | | | | | | | | | | Extract MR's widget into a separate endpointid-extract-widget-into-different-requestIgor Drozdov2019-06-2812-14/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commits extracts /merge_requests/1.json?serializer=widget Into a separate /merge_requests/1/widget.json endpoint This will allow to use caching for this request
* | | | | | | | | | | | Merge branch '44949-do-not-update-updated_at-on-an-issue-when-reordering-it' ↵Douwe Maan2019-06-284-13/+71
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Do not change updated_at on an issue when reordering on an issue board See merge request gitlab-org/gitlab-ce!29677
| * | | | | | | | | | | | 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 support See merge request gitlab-org/gitlab-ce!30102
| * | | | | | | | | | | | Backport CE changes for multiple GroupSAML supportsh-fix-issue-12303Stan Hu2019-06-271-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit makes it possible for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14420 to handle multiple SAML providers.
* | | | | | | | | | | | | Merge branch '62968-environment-details-header-border-misaligned' into 'master'Kushal Pandya2019-06-282-15/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Environment details header border misaligned" Closes #62968 See merge request gitlab-org/gitlab-ce!30011
| * | | | | | | | | | | | | Align page header for environment details view62968-environment-details-header-border-misalignedDave Pisek2019-06-282-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes an issue that caused the page header on the environment details page to be misaligned and bleeding out horizontlly. It removes standard bootstrap markup / classes and replaces it with utility classes.
* | | | | | | | | | | | | | Merge branch 'ce-11098-update-merge-request-settings-description-text' into ↵Filipa Lacerda2019-06-284-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' CE backport for gitlab-org/gitlab-ee!11859: Update description text of "Merge requests" section of general project settings page See merge request gitlab-org/gitlab-ce!27838
| * | | | | | | | | | | | | | Update project MR setting section description (CE)Nathan Friend2019-06-254-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the merge requests description text in the project settings page.
* | | | | | | | | | | | | | | Merge branch '6360-tree-header' into 'master'Phil Hughes2019-06-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for app/views/projects/tree/_tree_header.html.haml See merge request gitlab-org/gitlab-ce!30117
| * | | | | | | | | | | | | | | 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 text Closes #63558 See merge request gitlab-org/gitlab-ce!29965
| * | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove N+1 queries in boards API See merge request gitlab-org/gitlab-ce!29634
| * | | | | | | | | | | | | | | | Move order lambda to list scope63212-n-1-queries-in-projects-id-boards-apicharlieablett2019-06-272-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - apply ordering to both list scopes in `Board`
| * | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add test for N+1 queries - Add destroyable lists scope to Board and List - Preload lists for both project and group boards
* | | | | | | | | | | | | | | | | Merge branch 'vue-i18n-js-performance-bar-directory' into 'master'Kushal Pandya2019-06-283-7/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/performance_bar directory See merge request gitlab-org/gitlab-ce!30014
| * | | | | | | | | | | | | | | | | Namespace performance bar translationsvue-i18n-js-performance-bar-directoryEzekiel Kigbo2019-06-283-19/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added additional translations
| * | | | | | | | | | | | | | | | | Vue-i18n: app/assets/javascripts/performance_bar/ directoryEzekiel Kigbo2019-06-272-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/performance_bar/ directory
* | | | | | | | | | | | | | | | | | Merge branch 'docs/add-docs-site-arch-diagram' into 'master'Achilleas Pipinellis2019-06-281-5/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add diagram to site architecture docs See merge request gitlab-org/gitlab-ce!30147
| * | | | | | | | | | | | | | | | | | 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 emoji See merge request gitlab-org/gitlab-ce!29919
| * | | | | | | | | | | | | | | | | | GraphQL mutations for add, remove and toggle emoji62826-graphql-emoji-mutationsLuke Duncalfe2019-06-2825-6/+745
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding new `AddAwardEmoji`, `RemoveAwardEmoji` and `ToggleAwardEmoji` GraphQL mutations. Adding new `#authorized_find_with_pre_checks!` and (unused, but for completeness `#authorized_find_with_post_checks!`) authorization methods. These allow us to perform an authorized find, and run our own additional checks before or after the authorization runs. https://gitlab.com/gitlab-org/gitlab-ce/issues/62826
* | | | | | | | | | | | | | | | | | | Merge branch '58689-regroup-jump-button-in-discussion' into 'master'Phil Hughes2019-06-287-22/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rearrange discussion resolve buttons Closes #58689 See merge request gitlab-org/gitlab-ce!29779