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

	Commit message (Collapse)	Author	Age	Files	Lines
*	SSO enforcement for project resourcesce-jej/group-saml-project-enforcement	James Edwards-Jones	2019-05-08	1	-0/+4
\|
*	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
\| * \| \| \| \|	Add info to docs about mapping a ping to the category it belongs to.	Emilie Schario	2019-05-07	1	-0/+2
\|/ / / / /
* \| \| \| \|	Merge branch '53973-fix-subpixel-border-issue' into 'master'	Fatih Acet	2019-05-07	2	-0/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix subpixel border issue on MR discussions Closes #53973 See merge request gitlab-org/gitlab-ce!28185
\| * \| \| \| \|	Fix subpixel border issue53973-fix-subpixel-border-issue	Paul Slaughter	2019-05-07	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	What? In some browsers subpixel heights are rounded in tables. This was causing the discussion border to be hidden because the content overflowed. Adding `padding-bottom: 1px` basically overrides this rounding. https://gitlab.com/gitlab-org/gitlab-ce/issues/53973
* \| \| \| \| \|	Merge branch '61494-set-status-modal-visual-bugs' into 'master'	Fatih Acet	2019-05-07	4	-9/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix input group and action buttons in "set status" modal Closes #61494 See merge request gitlab-org/gitlab-ce!28147
\| * \| \| \| \| \|	Fix input group and action buttons in "set status" modal	Paul Gascou-Vaillancourt	2019-05-07	4	-9/+13
\|/ / / / / /
* \| \| \| \| \|	Merge branch '57654-add-time-preferences-for-user-fe' into 'master'	Fatih Acet	2019-05-07	17	-18/+300
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add time preferences for user [FE]" Closes #57654 See merge request gitlab-org/gitlab-ce!25381
\| * \| \| \| \|	Added user time settings fields to profile	Ezekiel Kigbo	2019-05-07	17	-18/+300
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Udpated user_edit_profile_spec with time preferences Minor update form fields
* \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \|