delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix pipelines table update after action63590-pipeline-actions-cause-full-refresh	shampton	2019-06-28	5	-10/+20
\| \| \| \| \| \| \|	The pipelines table was showing the loading icon after the user cancelled or retried a pipeline. This fixes that so the pipeline updates without removing the table from the DOM.
*	Merge branch 'revert-423c4c43' into 'master'62722-boot-app-in-ci-and-check-memory-v2	Rémy Coutable	2019-06-28	4	-40/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch '62722-boot-app-in-ci-and-check-memory' into 'master'" Closes gitlab-ee#12491 See merge request gitlab-org/gitlab-ce!30182
\| *	Revert "Merge branch '62722-boot-app-in-ci-and-check-memory' into 'master'"	Rémy Coutable	2019-06-28	4	-40/+5
\|/ \| \|	This reverts merge request !30031
*	Merge branch '10087-settings-pannel' into 'master'63463-follow-up-from-insights-is-now-ga 62296-conform-on-single-icon-for-dropdown-buttons-which-align-with-design-system	Phil Hughes	2019-06-28	2	-27/+55
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Moves EE differences for app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue Closes gitlab-ee#10087 See merge request gitlab-org/gitlab-ce!30127
\| *	Moves EE code into a mixin10087-settings-pannel	Filipa Lacerda	2019-06-28	2	-27/+55
\| \|
* \|	Merge branch 'last-commit-widget-api-call' into 'master'	Filipa Lacerda	2019-06-28	9	-100/+120
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use GraphQL API to fetch last commit data See merge request gitlab-org/gitlab-ce!29934
\| * \|	Use GraphQL API to fetch last commit data for tree	Phil Hughes	2019-06-28	9	-100/+120
\| \| \|
* \| \|	Merge branch 'transaction-metrics' into 'master'	Lin Jen-Shin	2019-06-28	4	-0/+42
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Monitor database transaction activity for Rails See merge request gitlab-org/gitlab-ce!29928
\| * \| \|	Adds metrics to measure database transactionstransaction-metrics	Andrew Newdigate	2019-06-28	4	-0/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently we don't have good insight into the affect of Rails transaction blocks on the application. If these blocks are held open for extended periods, they can have detrimental effects on the application. This change will allow us to track these transactions, with the aim of reducing their duration.
* \| \| \|	Merge branch 'qa-staging-59-fix-project-template-spec-ce' into 'master'	Lin Jen-Shin	2019-06-28	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port of "Fix project template spec" See merge request gitlab-org/gitlab-ce!30152
\| * \| \| \|	Use 'has_css?' because 'first' does not return booleanqa-staging-59-fix-project-template-spec-ce	Sanad Liaquat	2019-06-28	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs-update-subject-label-issue-workflow' into 'master'	Rémy Coutable	2019-06-28	1	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update issue workflow for subject labels See merge request gitlab-org/gitlab-ce!30164
\| * \| \| \| \|	Update issue workflow for subject labelsdocs-update-subject-label-issue-workflow	Mark Fletcher	2019-06-28	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mentions the automatic inference of stage and group labels based on the applied subject labels
* \| \| \| \| \|	Merge branch 'update-prometheus-client-mmap' into 'master'	Stan Hu	2019-06-28	2	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update prometheus-client-mmap to 0.9.6 Closes #63872 See merge request gitlab-org/gitlab-ce!30165
\| * \| \| \| \| \|	Update prometheus-client-mmap to 0.9.6update-prometheus-client-mmap	Kamil Trzciński	2019-06-28	2	-3/+3
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'small-s-in-elasticsearch-in-code' into 'master'	Rémy Coutable	2019-06-28	3	-2/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in code comments about Elasticsearch See merge request gitlab-org/gitlab-ce!30163
\| * \| \| \| \| \|	Fix typo in code comments about Elasticsearch	Takuya Noguchi	2019-06-28	3	-2/+7
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \| \| \|	Merge branch '63479-jira-capitalization' into 'master'	Rémy Coutable	2019-06-28	76	-236/+241
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace 'JIRA' with 'Jira' Closes #63479 See merge request gitlab-org/gitlab-ce!29849
\| * \| \| \| \| \|	Replace 'JIRA' with 'Jira'	Takuya Noguchi	2019-06-28	76	-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ński	2019-06-28	4	-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-memory	Aleksei Lipniagov	2019-06-28	4	-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 Landuyt	2019-06-28	1	-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-docs	Toon Claes	2019-06-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14257
* \| \| \| \| \| \|	Merge branch 'ee-issue/11039' into 'master'	Filipa Lacerda	2019-06-28	2	-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 CE	Michel Engelen	2019-06-28	2	-0/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '3264-project-aliases-ce' into 'master'	Bob Van Landuyt	2019-06-28	7	-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-ce	Patrick Bajao	2019-06-27	1	-0/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Specify feature was added in GitLab Premium	Patrick Bajao	2019-06-26	2	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add project_aliases to be imported/exported	Patrick Bajao	2019-06-26	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update related documentation	Patrick Bajao	2019-06-26	3	-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 API	Patrick Bajao	2019-06-26	2	-0/+114
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Create project_aliases table	Patrick Bajao	2019-06-26	2	-0/+26
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'set-higher-ttl-for-trace-write' into 'master'	Kamil Trzciński	2019-06-28	3	-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-write	Shinya Maeda	2019-06-28	3	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set higher TTL is safer option when it comes to long running archive
* \| \| \| \| \| \|	Merge branch 'docs/secure-maintenance' into 'master'	Marcia Ramos	2019-06-28	5	-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-maintenance	Achilleas Pipinellis	2019-06-26	5	-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 Kuah	2019-06-28	5	-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-limiter	Stan Hu	2019-06-27	5	-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-Shin	2019-06-28	12	-3/+139
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added commit type to tree GraphQL type See merge request gitlab-org/gitlab-ce!29412
\| * \| \| \| \| \| \| \|	Added commit type to tree GraphQL type	Phil Hughes	2019-06-28	12	-3/+139
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'id-extract-widget-into-different-request' into 'master'	Ash McKenzie	2019-06-28	12	-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-request	Igor Drozdov	2019-06-28	12	-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 Maan	2019-06-28	4	-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 board	Eugenia Grieff	2019-06-28	4	-13/+71
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-issue-12303' into 'master'	Grzegorz Bizon	2019-06-28	1	-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-12303	Stan Hu	2019-06-27	1	-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 Pandya	2019-06-28	2	-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-misaligned	Dave Pisek	2019-06-28	2	-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 Lacerda	2019-06-28	4	-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 Friend	2019-06-25	4	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit updates the merge requests description text in the project settings page.