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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'ce-jej/group-saml-project-enforcement' into 'master'	Nick Thomas	2019-05-09	1	-0/+4
\|\ \| \| \| \| \| \| \| \|	CE Changes for SSO enforcement in ProjectPolicy See merge request gitlab-org/gitlab-ce!28208
\| *	SSO enforcement for project resourcesce-jej/group-saml-project-enforcement	James Edwards-Jones	2019-05-08	1	-0/+4
\| \|
* \|	Merge branch 'patch-29' into 'master'	Fatih Acet	2019-05-09	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Open merge contribution about link in new tab See merge request gitlab-org/gitlab-ce!28142
\| * \|	Open merge collab link in new tab	trojkilla	2019-05-09	1	-1/+1
\|/ / \| \| \| \| \| \|	fixes clearing checked settings
* \|	Merge branch 'support-string-piwik-website-ids' into 'master'	Phil Hughes	2019-05-09	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Supports Matomo/Piwik string website ID ("Protect Track ID" plugin) Closes #61606 See merge request gitlab-org/gitlab-ce!28214
\| * \|	Adds quotes to Matomo/Piwik website ID	CDuv	2019-05-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When using Matomo/Piwik integration, only integer website IDs can be used. If using the "Protect Track ID" Matomo plugin (https://plugins.matomo.org/ProtectTrackID), website IDs are strings which the "_piwik.html.haml" layout file does not supports because it assumes "extra_config.piwik_site_id" variable contains an integer and prints it to JavaScript code without quotes. This commits surrounds "extra_config.piwik_site_id" variable with double quotes (") so that it works with both integers and strings. Issue: #61606
* \| \|	Merge branch '6105-move-ee-differences-group-members' into 'master'	Phil Hughes	2019-05-09	1	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Move EE differences for app/views/groups/group_members/index.html.haml See merge request gitlab-org/gitlab-ce!28026
\| * \| \|	CE: Move EE differences for6105-move-ee-differences-group-members	Donald Cook	2019-05-07	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	app/views/groups/group_members/index.html.haml
* \| \| \|	Merge branch 'acme-account-private-key' into 'master'	Grzegorz Bizon	2019-05-09	2	-1/+17
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate Let's Encrypt private key See merge request gitlab-org/gitlab-ce!27581
\| * \| \| \|	Generate Let's Encrypt private key	Vladimir Shushlin	2019-05-09	2	-1/+17
\|/ / / /
* \| \| \|	Merge branch 'patch-17' into 'master'	Phil Hughes	2019-05-09	1	-2/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doc: administration/planutml: update instructions for setting dialogs See merge request gitlab-org/gitlab-ce!28218
\| * \| \| \|	doc: administration/planutml: update instructions for setting dialogs	Elan Ruusamäe	2019-05-09	1	-2/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sh-upgrade-ruby-2.6.3-ce' into 'master'	Rémy Coutable	2019-05-09	14	-20/+26
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Ruby version to 2.6.3 See merge request gitlab-org/gitlab-ce!28117
\| * \| \| \| \|	Upgrade Ruby version to 2.6.3sh-upgrade-ruby-2.6.3-ce	Stan Hu	2019-05-08	14	-20/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ruby 2.6 offers better performance and memory usage: https://www.rubyguides.com/2018/11/ruby-2-6-new-features/ Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/57323
* \| \| \| \| \|	Merge branch 'add-warning-to-backup-rake-task' into 'master'	Rémy Coutable	2019-05-09	2	-0/+13
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add warning that gitlab-secrets isn't included See merge request gitlab-org/gitlab-ce!28187
\| * \| \| \| \|	Add warning that gitlab-secrets isn't includedadd-warning-to-backup-rake-task	Cindy Pallares	2019-05-08	2	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Many customers forget to include the gitlab-secrets.json file. This adds a warning that both gitlab-secrets.json and gitlab.rb are not included in the backup.
* \| \| \| \| \|	Merge branch 'antonyliu-i18n-user-profile' into 'master'	Rémy Coutable	2019-05-09	5	-11/+46
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	i18n: externalize strings from user profile settings See merge request gitlab-org/gitlab-ce!28088
\| * \| \| \| \| \|	i18n: externalize strings from user profile settings	antony liu	2019-05-09	5	-11/+46
\|/ / / / / /
* \| \| \| \| \|	Merge branch '61596-increase-timeout-for-discussion-notes-spec' into 'master'	Phil Hughes	2019-05-09	1	-2/+5
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix discussion notes spec timeout Closes #61596 See merge request gitlab-org/gitlab-ce!28212
\| * \| \| \| \|	Fix discussion notes spec timeout61596-increase-timeout-for-discussion-notes-spec	Paul Slaughter	2019-05-08	1	-2/+5
\| \|/ / / /
* \| \| \| \|	Merge branch 'jl-improve-component-table-clarity-docs' into 'master'	Sid Sijbrandij	2019-05-08	1	-3/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Better separate the component table and chart, improve grammar See merge request gitlab-org/gitlab-ce!28211
\| * \| \| \| \|	Add hline between table and chart, improve grammar	Joshua Lambert	2019-05-08	1	-3/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'admin-projects-show-scb' into 'master'	Phil Hughes	2019-05-08	1	-0/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	admin/projects/show.html.haml single codebase Closes gitlab-ee#6100 See merge request gitlab-org/gitlab-ce!28192
\| * \| \| \| \|	Resolve CE/EE diffs in admin/projects/show viewadmin-projects-show-scb	Luke Bennett	2019-05-08	1	-0/+2
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.
* \| \| \| \|	Merge branch 'patch-37' into 'master'	Achilleas Pipinellis	2019-05-08	1	-4/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix doc link issues See merge request gitlab-org/gitlab-ce!28166
\| * \| \| \| \|	fix doc link issues	Ben Bodenmiller	2019-05-07	1	-4/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'jl-remove-k8s-components-mermaid-docs' into 'master'	Achilleas Pipinellis	2019-05-08	1	-99/+65
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove k8s components, remove default status indicators See merge request gitlab-org/gitlab-ce!28195
\| * \| \| \| \|	Resolve conflicts from masterjl-remove-k8s-components-mermaid-docs	Joshua Lambert	2019-05-08	1	-99/+65
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'ce-9688-mr-merge-order' into 'master'	Ash McKenzie	2019-05-08	2	-0/+36
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport of merge request blocks - backend MVC See merge request gitlab-org/gitlab-ce!27323
\| * \| \| \| \| \|	Backport of initial merge request blocks supportce-9688-mr-merge-order	Nick Thomas	2019-05-03	2	-0/+36
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '25830-fix-label-creation-bug-for-bitbucket-import' into 'master'	Mayra Cabrera	2019-05-08	3	-1/+46
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix label creation within Bitbucket import if labels already exist Closes #58623 See merge request gitlab-org/gitlab-ce!27987
\| * \| \| \| \| \| \|	Refactor spec to reload existing_label right after creation	Patrick Derichs	2019-05-08	3	-1/+46
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will avoid timestamp comparison issues later within equality check with attributes
* \| \| \| \| \| \|	Merge branch '60953-unquarantine-jira-spec' into 'master'	Nick Thomas	2019-05-08	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove jira_spec from quarantine Closes #60953 See merge request gitlab-org/gitlab-ce!28203
\| * \| \| \| \| \|	Remove jira_spec from quarantine60953-unquarantine-jira-spec	Heinrich Lee Yu	2019-05-08	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch '6361-move-ee-notify-text-haml' into 'master'	Phil Hughes	2019-05-08	1	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Fixes EE differences for app/views/repository_check_mailer/notify.text.haml See merge request gitlab-org/gitlab-ce!28022
\| * \| \| \| \| \|	CE: Fixes EE differences for6361-move-ee-notify-text-haml	Donald Cook	2019-05-07	1	-0/+2
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	app/views/repository_check_mailer/notify.text.haml
* \| \| \| \| \|	Merge branch '58404-set-default-max-depth-for-GraphQL' into 'master'	Sean McGivern	2019-05-08	5	-44/+135
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	58404 - setup max depth for graphql Closes #58404 See merge request gitlab-org/gitlab-ce!25737
\| * \| \| \| \| \|	58404 - setup max depth for graphql	Ken Ding	2019-05-07	5	-44/+135
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	58404 - add change log 58404 - add spec 58404 - add more spec to test depth 2 58404 - fix spec 58404 - fix rubocop 58404 - refactor the code by Bob's advice 58404 - revert changes of all_graphql_fields_for 58404 - change text only 58404 - fix rspec according to gitlab's standard 58404 - revert previous spec 58404 - fix rubocop
* \| \| \| \| \| \|	Merge branch 'fe-header-row' into 'master'	Phil Hughes	2019-05-08	7	-28/+61
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds header column to variables list Closes #46806 See merge request gitlab-org/gitlab-ce!28060
\| * \| \| \| \| \| \|	Adds header column to variables listfe-header-row	Filipa Lacerda	2019-05-07	7	-28/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For the variables list in CI/CD settings this commits adds an header row with titles
* \| \| \| \| \| \| \|	Merge branch 'winh-notes-error-handling' into 'master'	Fatih Acet	2019-05-08	6	-7/+87
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Handle errors in successful notes reply Closes #61377 See merge request gitlab-org/gitlab-ce!28082
\| * \| \| \| \| \| \|	Make hasQuickActions statelesswinh-notes-error-handling	Winnie Hellmann	2019-05-07	1	-3/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add failing test for hasQuickActions	Winnie Hellmann	2019-05-07	1	-0/+17
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Handle errors in successful notes reply	Winnie Hellmann	2019-05-07	3	-4/+21
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add failing test for saveNote error handling	Winnie Hellmann	2019-05-07	1	-0/+45
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'docs-nneul/gitlab-ce-patch-1' into 'master'	Achilleas Pipinellis	2019-05-08	1	-0/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs nneul/gitlab ce patch 1 Closes omnibus-gitlab#4132 See merge request gitlab-org/gitlab-ce!28182
\| * \| \| \| \| \| \| \|	Docs nneul/gitlab ce patch 1	Ian Baum	2019-05-08	1	-0/+16
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'revert-0658ebf7' into 'master'	Achilleas Pipinellis	2019-05-08	1	-5/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'fix-mermaid-chart-docs' into 'master'" See merge request gitlab-org/gitlab-ce!28193
\| * \| \| \| \| \| \| \|	Revert "Merge branch 'fix-mermaid-chart-docs' into 'master'"revert-0658ebf7	Stan Hu	2019-05-07	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !28188
* \| \| \| \| \| \| \| \|	Merge branch 'emilie-master-patch-81125' into 'master'	Evan Read	2019-05-07	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add info to docs about mapping a ping to the category it belongs to. See merge request gitlab-org/gitlab-ce!28189