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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add a default reactive cache keyadd-default-reactive-cache-key	Tiger	2019-06-07	5	-5/+15
\| \| \| \| \|	Aligns with the other reactive cache options by providing a default that can be overridden if necessary.
*	Merge branch 'update_source_#62187' into 'master'	Achilleas Pipinellis	2019-06-07	2	-11/+51
\|\ \| \| \| \| \| \| \| \|	Add git 2.21 install from update_source See merge request gitlab-org/gitlab-ce!28836
\| *	Add git 2.21 install from update_source	Æx	2019-06-07	2	-11/+51
\|/
*	Merge branch '9764-operations-icon-is-shown-twice-on-small-viewport' into ↵	Kushal Pandya	2019-06-07	1	-16/+16
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	'master' Hide operations icon in small screens See merge request gitlab-org/gitlab-ce!29230
\| *	Hide operations icon in small screens9764-operations-icon-is-shown-twice-on-small-viewport	Dhiraj Bodicherla	2019-06-06	1	-16/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In small screens operations icon is visible and also present in More menu. This commit cleans up the More menu for small screens and also shows and hides nav links appropriately based on screen sizes Cleaned up title attrs in dashboard
* \|	Merge branch 'docs/58975-jira-integration-docs' into 'master'	Mike Lewis	2019-06-07	8	-22/+27
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve Jira Server documentation Closes #58975 See merge request gitlab-org/gitlab-ce!28463
\| * \|	Apply reviewer feedbackdocs/58975-jira-integration-docs	Mike Lewis	2019-06-07	2	-17/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Remove image for adding new permission scheme - Delete jira_add_permission_scheme.png as no longer included in content - add group language - Reword the add user to group instructions - Reword the add selected users instruction - Reword add permission scheme instruction - Update jira_server_configuration intro
\| * \|	Change text to match screencaps	charlieablett	2019-06-07	1	-2/+2
\| \| \|
\| * \|	Reword for clarity	charlieablett	2019-06-07	1	-2/+2
\| \| \|
\| * \|	Upgrade jira user permissions workflow docs	charlieablett	2019-06-07	8	-14/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update screecaps to reflect jira version ~8.1 and update instructions to include Permission Schemes.
\| * \|	Fix some typoes	charlieablett	2019-06-07	1	-2/+2
\| \| \|
* \| \|	Merge branch 'sh-improve-openid-docs' into 'master'	Evan Read	2019-06-07	1	-0/+35
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix OpenID Connect documentation See merge request gitlab-org/gitlab-ce!29314
\| * \| \|	Fix OpenID Connect documentationsh-improve-openid-docs	Stan Hu	2019-06-06	1	-0/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Many users were unable to get logins working with OpenID Connect because of a missing `name` argument in the configuration. This resulted in 404s immediately after attempting to login. This describes the workaround mentioned in https://gitlab.com/gitlab-org/gitlab-ce/issues/62208#note_178774809. This also adds an example profile for using Google.
* \| \| \|	Merge branch 'sh-fix-openid-connect-defaults' into 'master'	Ash McKenzie	2019-06-07	3	-0/+19
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make OpenID Connect work without requiring a name Closes #62208 See merge request gitlab-org/gitlab-ce!29312
\| * \| \| \|	Make OpenID Connect work without requiring a namesh-fix-openid-connect-defaults	Stan Hu	2019-06-06	3	-0/+19
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If there is no name argument given, OmniAuth will try to guess the name by the class name. In https://github.com/omniauth/omniauth/blob/v1.9.0/lib/omniauth/strategy.rb#L139, `OmniAuth::Strategies::OpenIDConnect` gets translated to `openidconnect`. This leads to an immediate 404 error after clicking the login button because OmniAuth can't match the current route (/users/auth/openid_connect) against the expected one (/users/auth/openidconnect). Other providers, such as Google OAuth2, set this name as the default option within the OmniAuth Strategy. Until a fix is merged upstream, let's just set the parameter ourselves. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62208
* \| \| \|	Merge branch 'docs/add-chatops-request-doc' into 'master'	Evan Read	2019-06-07	5	-4/+32
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	docs - add section to dev docs on accessing chatops Closes #62127 See merge request gitlab-org/gitlab-ce!28623
\| * \| \| \|	Add section to dev docs on accessing chatops	Lucas Charles	2019-06-07	5	-4/+32
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	closes 62127
* \| \| \|	Merge branch 'docs/realign-ce-docs' into 'master'	Evan Read	2019-06-07	1	-5/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port missing docs to CE See merge request gitlab-org/gitlab-ce!29279
\| * \| \| \|	Port missing docs to CEdocs/realign-ce-docs	Achilleas Pipinellis	2019-06-06	1	-5/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'docs/add-ci-breaking-changes' into 'master'	Evan Read	2019-06-07	1	-0/+27
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for breaking changes of GitLab CI in 12.0 See merge request gitlab-org/gitlab-ce!29053
\| * \| \| \| \|	Add docs for breaking changes of GitLab CI in 12.0docs/add-ci-breaking-changes	Steve Azzopardi	2019-06-06	1	-0/+27
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'qa-ml-visit-after-wait-for-push' into 'master'	Mark Lapierre	2019-06-07	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Visit project after push Closes gitlab-org/quality/nightly#105 See merge request gitlab-org/gitlab-ce!29247
\| * \| \| \| \| \|	Visit project after pushqa-ml-visit-after-wait-for-push	Mark Lapierre	2019-06-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Waits for the push to a project before visiting the page so that the updated state is shown when the page loads
* \| \| \| \| \| \|	Merge branch 'remove-dup-shared-context-folder' into 'master'	Robert Speicher	2019-06-06	1	-0/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes duplicated shared_context folder on spec/support See merge request gitlab-org/gitlab-ce!29305
\| * \| \| \| \| \| \|	Removes duplicated shared_context folderremove-dup-shared-context-folder	Mayra Cabrera	2019-06-06	1	-0/+0
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Most of the shared context are located under spec/support/shared_contexts, we only have one file under spec/support/shared_context, this MR moves it to spec/support/shared_contexts instead
* \| \| \| \| \| \|	Merge branch '60303-replace-sidekiq-mtail-metrics' into 'master'	Robert Speicher	2019-06-06	3	-7/+6
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds sidekiq worker label for ruby metrics Closes #60303 See merge request gitlab-org/gitlab-ce!29215
\| * \| \| \| \| \|	Add changelog entry for sidekiq metricsrc/test_rebase 60303-replace-sidekiq-mtail-metrics	Ryan Cobb	2019-06-06	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Adds sidekiq worker label for ruby metrics	Ryan Cobb	2019-06-06	2	-7/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'ce-5456-add-cluster-health-alert-frontend' into 'master'	Mike Greiling	2019-06-06	2	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport: Add frontend support for cluster health alerts See merge request gitlab-org/gitlab-ce!29075
\| * \| \| \| \| \| \|	Add frontend support for cluster health alerts	Adriel Santiago	2019-06-06	2	-0/+5
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds a new query text input for metric alerts
* \| \| \| \| \| \|	Merge branch '59232-add-storage-counter-ce' into 'master'	Phil Hughes	2019-06-06	3	-1/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport for Storage Counter changes Closes #59232 See merge request gitlab-org/gitlab-ce!29206
\| * \| \| \| \| \| \|	Adds hashed option to bs linked options59232-add-storage-counter-ce	Filipa Lacerda	2019-06-05	3	-1/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds isOdd function
* \| \| \| \| \| \| \|	Merge branch 'dont-fail-danger-with-emojis' into 'master'62884-the-next-kn-service-deployed-don-t-get-fetched-due-to-reactivecaching	Robert Speicher	2019-06-06	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't fail the pipeline when a colon-emoji is used See merge request gitlab-org/gitlab-ce!29291
\| * \| \| \| \| \| \|	Don't fail the pipeline when a colon-emoji is used	Sean McGivern	2019-06-06	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A colon-emoji like :100: can be valid in the case where we're talking about the GitLab feature that processes these into emojis. It's fine to warn about those, but failing the pipeline is too restrictive.
* \| \| \| \| \| \| \|	Merge branch 'pages-domains-validity-time-mysql' into 'master'	Nick Thomas	2019-06-06	8	-2/+163
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add certificate valid time to pages domain table See merge request gitlab-org/gitlab-ce!29287
\| * \| \| \| \| \| \| \|	Add certificate valid time to pages domain table	Vladimir Shushlin	2019-06-06	8	-2/+163
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Save certificate validity time for pages domains on save Fill validity time for existing pages domains in background migration
* \| \| \| \| \| \| \|	Merge branch 'pages_lets_encrypt_orders' into 'master'	Nick Thomas	2019-06-06	18	-35/+552
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add pages domains acme orders See merge request gitlab-org/gitlab-ce!27811
\| * \| \| \| \| \| \| \|	Add pages domains acme orders	Vladimir Shushlin	2019-06-06	18	-35/+552
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract acme double to helper Create ACME challanges for pages domains * Create order & challange through API * save them to database * request challenge validation We're saving order and challenge as one entity, that wouldn't be correct if we would order certificates for several domains simultaneously, but we always order certificate per domain Add controller for processing acme challenges redirected from pages Don't save acme challenge url - we don't use it Validate acme challenge attributes Encrypt private_key in acme orders
* \| \| \| \| \| \| \|	Merge branch 'docs-qa-dynamic-element-validation' into 'master'	Dan Davison	2019-06-06	2	-3/+149
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation for dynamic element validation See merge request gitlab-org/gitlab-ce!29169
\| * \| \| \| \| \| \|	Documentation for dynamic element validationdocs-qa-dynamic-element-validation	ddavison	2019-06-05	2	-3/+149
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First iteration on the documentation for how dynamic element validation works within the GitLab QA framework and how to utilize it
* \| \| \| \| \| \| \|	Merge branch 'master' into 'master'	Stan Hu	2019-06-06	3	-4/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix some typos See merge request gitlab-org/gitlab-ce!29286
\| * \| \| \| \| \| \| \|	Fix some typos	William Desportes	2019-06-06	3	-4/+4
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: William Desportes <williamdes@wdes.fr>
* \| \| \| \| \| \| \|	Merge branch 'update-gitlab-shell-9-3-0' into 'master'	Douglas Barbosa Alexandre	2019-06-06	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update to GitLab Shell v9.3.0 See merge request gitlab-org/gitlab-ce!29283
\| * \| \| \| \| \| \| \|	Update to GitLab Shell v9.3.0	Nick Thomas	2019-06-06	2	-1/+6
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'create-base-class-for-auto-merge-architecture' into 'master'	Robert Speicher	2019-06-06	5	-60/+201
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create BaseService for Auto Merge architecture See merge request gitlab-org/gitlab-ce!29120
\| * \| \| \| \| \| \| \|	Create BaseService for Auto Merge architecturecreate-base-class-for-auto-merge-architecture	Shinya Maeda	2019-06-06	5	-60/+201
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It abstracts some codes for common methods in AutoMerge::*Services.
* \| \| \| \| \| \| \|	Merge branch 'winh-increase-jest-timeout-ci' into 'master'	Phil Hughes	2019-06-06	2	-3/+15
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Increase Jest timeout on CI to 5 seconds Closes #62855, #61905, and #61235 See merge request gitlab-org/gitlab-ce!29278
\| * \| \| \| \| \| \|	Increase Jest timeout on CI to 5 seconds	Winnie Hellmann	2019-06-06	2	-3/+15
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '58882-update-rspec-retry' into 'master'	Stan Hu	2019-06-06	2	-4/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update rspec-retry to fix Selenium NoSuchDriverError errors Closes #58882 See merge request gitlab-org/gitlab-ce!29276
\| * \| \| \| \| \| \|	Update rspec-retry to fix Selenium NoSuchDriverError errors	Rémy Coutable	2019-06-06	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>