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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Ensure that dependencies are installed before running frontend testswinh-frontend-tests-check-dependencies	Winnie Hellmann	2019-05-13	1	-0/+4
\|
*	Merge branch 'qa-quarantine-download-mr-patch-and-diff-test-suite' into 'master'	Dan Davison	2019-05-07	1	-1/+2
\|\ \| \| \| \| \| \| \| \|	Quarantine download MR patch and diff test suite See merge request gitlab-org/gitlab-ce!28179
\| *	Quarantine download MR patch and diff test suiteqa-quarantine-download-mr-patch-and-diff-test-suite	Walmyr Lima	2019-05-07	1	-1/+2
\| \|
* \|	Merge branch 'ce-jej/group-saml-sso-enforcement' into 'master'	Robert Speicher	2019-05-07	2	-2/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	CE changes for SSO web enforcement See merge request gitlab-org/gitlab-ce!28141
\| * \|	CE changes for SSO web enforcementce-jej/group-saml-sso-enforcement	James Edwards-Jones	2019-05-06	2	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds two methods for us to extend in EE: - OmniauthCallbacksController#link_identity - GroupPolicy#lookup_access_level!
* \| \|	Merge branch 'fix-mermaid-chart-docs' into 'master'	Sid Sijbrandij	2019-05-07	1	-2/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load mermaid.min.js for now off-site See merge request gitlab-org/gitlab-ce!28188
\| * \| \|	Load mermaid.min.js for now off-site	Joshua Lambert	2019-05-07	1	-2/+5
\| \| \| \|
* \| \| \|	Merge branch ↵	Robert Speicher	2019-05-07	1	-0/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'ce-11099-removing-the-project-that-holds-the-insights-configuration-raises-an-error' into 'master' Add remove_foreign_key_if_exists See merge request gitlab-org/gitlab-ce!28172
\| * \| \| \|	Add remove_foreign_key_if_existsce-11099-removing-the-project-that-holds-the-insights-configuration-raises-an-error	Lin Jen-Shin	2019-05-07	1	-0/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'shell-9-1-0' into 'master'	Douglas Barbosa Alexandre	2019-05-07	2	-1/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab-shell to v9.1.0 See merge request gitlab-org/gitlab-ce!28184
\| * \| \| \| \|	Update gitlab-shell to v9.1.0	Nick Thomas	2019-05-07	2	-1/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '10808-allow-license-import-during-install' into 'master'	Achilleas Pipinellis	2019-05-07	4	-3/+40
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document EE License Auto Import During Install Closes gitlab-ee#10808 See merge request gitlab-org/gitlab-ce!28106
\| * \| \| \| \|	Document EE License Auto Import During Install	Robert Marshall	2019-05-07	4	-3/+40
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Document how to properly configure `GITLAB_LICENSE_FILE` environment variable in source and omnibus installations. Resolves: https://gitlab.com/gitlab-org/gitlab-ee/issues/10808 Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
* \| \| \| \|	Merge branch 'ce-4452-in-line-chart-designer-mvc' into 'master'	Clement Ho	2019-05-07	5	-60/+150
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport EE Add custom metrics form to dashboard to CE See merge request gitlab-org/gitlab-ce!27868
\| * \| \| \| \|	Add custom metrics form to dashboard	Adriel Santiago	2019-05-07	5	-60/+150
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use existing form to allow users to add custom metrics via the dashboard
* \| \| \| \|	Merge branch 'js-i18n-protected-branches' into 'master'	Clement Ho	2019-05-07	4	-3/+13
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Internationalisation of protected_branches directory See merge request gitlab-org/gitlab-ce!27737
\| * \| \| \|	Internationalisation of protected_branches directory	Brandon Labuschagne	2019-05-07	4	-3/+13
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* \| \| \|	Merge branch 'patch-24' into 'master'	Drew Blessing	2019-05-07	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs: clarify LDAP cache time See merge request gitlab-org/gitlab-ce!22095
\| * \| \| \|	docs: clarify LDAP cache time	Ben Bodenmiller	2019-05-07	1	-2/+2
\|/ / / /
* \| \| \|	Merge branch 'fix/js-error-ssh-key-view' into 'master'	Clement Ho	2019-05-07	2	-0/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix(profile): disable SSH key validation in key details view See merge request gitlab-org/gitlab-ce!28180
\| * \| \| \|	fix(profile): disable SSH key validation in key details view	Roger Meier	2019-05-07	2	-0/+7
\|/ / / /
* \| \| \|	Merge branch 'docs-10k-ref-wip' into 'master'	Drew Blessing	2019-05-07	1	-1/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add the 10k ref architecture specs to HA docs See merge request gitlab-org/gitlab-ce!28149
\| * \| \| \|	Apply suggestion to doc/administration/high_availability/README.md	Drew Blessing	2019-05-07	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add the WIP 10k ref architecture specs to HA docs	Drew Blessing	2019-05-06	1	-1/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The 10,000 user reference architecture work is ongoing. However, we have done some preliminary investigation and testing and have an idea of what we think the environment might look like. In the interest of transparency, efficiency and iteration, let's get this out there.
* \| \| \| \|	Merge branch '56850-add-new-unicorn-metrics' into 'master'	Ash McKenzie	2019-05-07	9	-29/+153
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add new Unicorn metrics" Closes #56850 See merge request gitlab-org/gitlab-ce!27474
\| * \| \| \| \|	Clarify wording in metrics documentation56850-add-new-unicorn-metrics	Ryan Cobb	2019-05-01	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Cleanup spec by removing not needed let	Ryan Cobb	2019-04-30	1	-2/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add back ruby_memory_bytes metric, limit duplication, clean up	Ryan Cobb	2019-04-29	3	-11/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds back ruby_memory_bytes for backwards compatibility, limits code duplication, cleans up unused methods, and limits the unicorn worker sampling scope.
\| * \| \| \| \|	Cleanup syntax in System max_open_file_descriptors	Ryan Cobb	2019-04-26	1	-4/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Update docs and calculate process start time via proc table	Ryan Cobb	2019-04-24	5	-34/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This updates monitor docs to reflect the new ruby and unicorn metrics as well as making it so we fetch process start time via the proc table instead of via CLOCK_BOOTTIME
\| * \| \| \| \|	Move process specific metrics to ruby sampler	Ryan Cobb	2019-04-24	4	-23/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These metrics are not unicorn specific and can be used across ruby processes
\| * \| \| \| \|	Adds new metrics for unicorn monitoring	Ryan Cobb	2019-04-18	6	-13/+103
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds new metrics for monitoring unicorn. These metrics include process_cpu_seconds_total, process_start_time_seconds, process_max_fds, and unicorn_workers.
* \| \| \| \| \|	Merge branch '55127-add-delay-after-mr-creation-for-async-tasks-to-complete' ↵	James Lopez	2019-05-07	3	-0/+36
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Confirm pipeline existence when accepting a MR Closes #55127 See merge request gitlab-org/gitlab-ce!27978
\| * \| \| \| \| \|	Confirm existence of head_pipeline if pipeline success required	Kerri Miller	2019-05-07	3	-0/+36
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pipelines are created by an async worker, so a rapid sequence of API calls can trigger a state where the pipeline, whose existence is part of determining if we wait for the pipeline to successfully complete before merging, can trigger the MR to be immediately merged instead. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55127
* \| \| \| \| \|	Merge branch 'jl-architecture-mermaid-docs' into 'master'	Achilleas Pipinellis	2019-05-07	1	-2/+146
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update component diagram, switch to mermaid See merge request gitlab-org/gitlab-ce!27780
\| * \| \| \| \| \|	Update component diagram, switch to mermaid	Joshua Lambert	2019-05-07	1	-2/+146
\|/ / / / / /
* \| \| \| \| \|	Merge branch '60462-empty-pipeline-section' into 'master'	Mayra Cabrera	2019-05-07	4	-2/+42
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes empty block in MR widget Closes #60462 See merge request gitlab-org/gitlab-ce!27462
\| * \| \| \| \| \|	Fixes empty block in MR widget	Filipa Lacerda	2019-05-07	4	-2/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit prevents the pipeline block to be rendered when no pipeline information is provided
* \| \| \| \| \| \|	Merge branch '54405-resolve-discussion-when-applying-a-suggested-change' ↵	Phil Hughes	2019-05-07	10	-124/+283
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Resolve discussion when suggestion is applied" Closes #54405 See merge request gitlab-org/gitlab-ce!28160
\| * \| \| \| \| \| \|	Resolve discussion when suggestion is applied54405-resolve-discussion-when-applying-a-suggested-change	Paul Slaughter	2019-05-07	10	-124/+283
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Adds color and a tooltip to describe this new behavior - Does not resolve if discussion is already resolved - Adds an action `resolveDiscussion` to simplify `toggleResolveNote` - Updates docs https://gitlab.com/gitlab-org/gitlab-ce/issues/54405
* \| \| \| \| \| \| \|	Merge branch 'register-gitaly-flags' into 'master'	Sean McGivern	2019-05-07	1	-1/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Register "gitaly_delta_islands" feature flag See merge request gitlab-org/gitlab-ce!28181
\| * \| \| \| \| \| \| \|	Register "gitaly_delta_islands" feature flag	Jacob Vosmaer	2019-05-07	1	-1/+2
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'sh-fix-related-merge-requests-path' into 'master'	Rémy Coutable	2019-05-07	4	-1/+44
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use a path for the related merge requests endpoint Closes #61280 See merge request gitlab-org/gitlab-ce!28171
\| * \| \| \| \| \| \| \|	Use a path for the related merge requests endpointsh-fix-related-merge-requests-path	Stan Hu	2019-05-07	4	-1/+44
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hosts using a non-standard configuration may have a different hostname/port/scheme than what may be configured on the GitLab server. While expose_url should generate a proper URL, there are cases where it may not work. Since we don't need the full URL, we can use the relative path. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61280
* \| \| \| \| \| \| \|	Merge branch '57171-link-to-grafana-on-metrics-dashboard' into 'master'	Clement Ho	2019-05-07	11	-1/+286
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Link to Grafana on metrics dashboard" Closes #57171 See merge request gitlab-org/gitlab-ce!27880
\| * \| \| \| \| \| \| \|	Add external dashboard link	Adriel Santiago	2019-05-07	11	-1/+286
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add settings for linking to external dashboard from metrics dashboard
* \| \| \| \| \| \| \|	Merge branch '58882-reduce-test-view-port' into 'master'	Rémy Coutable	2019-05-07	4	-9/+23
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Try to reduce testing viewport Closes #58882 See merge request gitlab-org/gitlab-ce!27385
\| * \| \| \| \| \| \| \|	Avoid quick action prompt blocking preview button58882-reduce-test-view-port	Lin Jen-Shin	2019-05-07	2	-5/+14
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Try to reduce testing view port and unify it	Lin Jen-Shin	2019-05-07	2	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hoping that we don't hit into Selenium::WebDriver::Error::NoSuchDriverError: invalid session id Again.
* \| \| \| \| \| \| \| \|	Merge branch 'patch-35' into 'master'	Achilleas Pipinellis	2019-05-07	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix alert box formatting See merge request gitlab-org/gitlab-ce!28159