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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update DB requirements in the documentationupdate-database-requirements	Yorick Peterse	2017-05-11	1	-5/+12
\| \| \| \| \| \| \| \| \| \| \|	This makes it more obvious that we greatly prefer PostgreSQL over MySQL/MariaDB and that all users are recommended to use PostgreSQL instead. This also removes the paragraph mentioning the size per user row, as this is completely inaccurate and doesn't really help users with anticipating the database size. Instead we now simply recommend users to have at least 5-10 GB of storage at minimum. [ci skip]
*	Merge branch 'docs/complement-tech-articles' into 'master'	Sean Packham (GitLab)	2017-05-11	7	-12/+25
\|\ \| \| \| \| \| \| \| \|	Complement tech articles guidelines See merge request !11260
\| *	Complement tech articles guidelines	Marcia Ramos	2017-05-11	7	-12/+25
\|/
*	Merge branch 'patch-18' into 'master'	Achilleas Pipinellis	2017-05-11	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Update getting_started_part_one.md. See merge request !11020
\| *	Update getting_started_part_one.md. Minor spelling error.	Kevin Nesmith	2017-05-01	1	-1/+1
\| \|
* \|	Merge branch 'docs/fix-broken-link' into 'master'	Achilleas Pipinellis	2017-05-11	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix a broken link for the "How to Configure LDAP with GitLab EE" article See merge request !11114
\| * \|	Fix a broken link for the "How to Configure LDAP with GitLab EE" articledocs/fix-broken-link	Rémy Coutable	2017-05-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \|	Merge branch 'master' into 'master'	Achilleas Pipinellis	2017-05-11	1	-2/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update README.md with Authentication projects example See merge request !11162
\| * \| \|	Update README.md with projects example	Toni	2017-05-08	1	-2/+3
\| \| \| \|
* \| \| \|	Merge branch 'dm-fix-mysql-failure' into 'master'	Sean McGivern	2017-05-11	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MySQL build failure Closes #32106 See merge request !11277
\| * \| \| \|	Fix MySQL build failuredm-fix-mysql-failure	Douwe Maan	2017-05-10	2	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch '32016-slash-command-strip-fix' into 'master'	Filipa Lacerda	2017-05-11	2	-7/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix slash commands detection in comments Closes #32016 See merge request !11265
\| * \| \| \| \|	Fix slash commands detection in comments	Kushal Pandya	2017-05-11	2	-7/+20
\|/ / / / /
* \| \| \| \|	Merge branch '32045-vue-warn-cannot-find-element-issuable-time-tracker' into ↵	Phil Hughes	2017-05-11	1	-42/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Remove sidebar bundle spec Closes #32045 See merge request !11223
\| * \| \| \| \|	Remove sidebar bundle spec32045-vue-warn-cannot-find-element-issuable-time-tracker	Clement Ho	2017-05-10	1	-42/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'issue_api_change' into 'master'	Sean McGivern	2017-05-11	1	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue API change: assignee_id parameter and assignee object in a response See merge request !11271
\| * \| \| \| \| \|	Issue API change: assignee_id parameter and assignee object in a responseissue_api_change	Valery Sizov	2017-05-11	1	-0/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dm-auxiliary-viewers' into 'master'	Sean McGivern	2017-05-11	32	-140/+616
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement auxiliary blob viewers See merge request !11195
\| * \| \| \| \| \| \|	Add changelogdm-auxiliary-viewers	Douwe Maan	2017-05-10	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Reset Repository#license memo when license file is changed	Douwe Maan	2017-05-10	2	-8/+15
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Implement auxiliary blob viewers	Douwe Maan	2017-05-10	31	-134/+598
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '32087-fix-flickering-system-notes' into 'master'	Phil Hughes	2017-05-11	1	-0/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix flickering of system notes Closes #32087 See merge request !11281
\| * \| \| \| \| \| \|	Fix flickering of system notes32087-fix-flickering-system-notes	Eric Eastwood	2017-05-10	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32087 Easy reproduction: 1. Edit an issue title 1. Notice the system note added 1. Switch to another tab and back (to fire the polling immediately) 1. Notice the flicker (without this fix)
* \| \| \| \| \| \| \|	Merge branch ↵	Phil Hughes	2017-05-11	4	-3/+10
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'31625-tag-editor-loses-all-inputs-when-you-try-to-add-a-tag-that-already-exists' into 'master' Resolve "Tag editor loses all inputs when you try to add a tag that already exists" Closes #31625 See merge request !11155
\| * \| \| \| \| \| \| \|	Keep input data after creating existing tag	Sam Rose	2017-05-10	4	-3/+10
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '32094-custom-notifications-model-aria-labelledby-incorrect' ↵	Phil Hughes	2017-05-11	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Fix aria labels on custom notifications modal Closes #32094 See merge request !11256
\| * \| \| \| \| \| \| \|	Fix aria labels on custom notifications modal32094-custom-notifications-model-aria-labelledby-incorrect	Sam Rose	2017-05-10	1	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-shortcuts_spec-explore-page-transient-failure' into 'master'	Douwe Maan	2017-05-11	1	-14/+17
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Find the nothing-here-block before asserting page content when on explore page of shortcuts_spec.rb See merge request !11250
\| * \| \| \| \| \| \| \|	Fix `send_key` to `send_keys` and add EOF newlinefix-shortcuts_spec-explore-page-transient-failure	Luke "Jared" Bennett	2017-05-10	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Find the nothing-here-block before asserting page content when on explore ↵	Luke "Jared" Bennett	2017-05-10	1	-15/+18
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	page of shortcuts_spec.rb
* \| \| \| \| \| \| \|	Merge branch 'docs/hide-gcp-install' into 'master'	Marcia Ramos	2017-05-10	2	-2/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide GCP install guide from index page until our image is released Closes omnibus-gitlab#2326 See merge request !11213
\| * \ \ \ \ \ \ \	Merge branch 'master' into 'docs/hide-gcp-install'docs/hide-gcp-install	Achilleas Pipinellis	2017-05-10	276	-1218/+3853
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # doc/install/README.md
\| * \| \| \| \| \| \| \|	Hide GCP install guide from index page until our image is added	Achilleas Pipinellis	2017-05-09	2	-2/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'retried-in-database-mysql' into 'master'	Regis Boudinot	2017-05-10	18	-41/+152
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Retried in database Closes #25737 See merge request !11115
\| * \| \| \| \| \| \| \| \|	Fix rubocop failure	Kamil Trzcinski	2017-05-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Make retried to be nullable	Kamil Trzcinski	2017-05-09	6	-14/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Store retried in database for CI buildsretried-in-database-mysql	Kamil Trzcinski	2017-05-07	18	-41/+158
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'winh-pending-ajax-cache' into 'master'	Clement Ho	2017-05-10	2	-38/+89
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Track pending requests in AjaxCache See merge request !11170
\| * \| \| \| \| \| \| \| \| \|	Track pending requests in AjaxCache	Winnie Hellmann	2017-05-10	2	-38/+89
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'enforce-current-user-usage-on-entities' into 'master'	Kamil Trzciński	2017-05-10	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make all Serializers receive `current_user` instead `user` [CE] See merge request !11254
\| * \| \| \| \| \| \| \| \| \|	Remove unnecessary user hash being passed to DeploymentSerializerenforce-current-user-usage-on-entities	Oswaldo Ferreira	2017-05-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Ensure all Serializers receive `current_user` instead `user`	Oswaldo Ferreira	2017-05-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into ↵	Robert Speicher	2017-05-10	153	-218/+217
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063
\| * \| \| \| \| \| \| \| \| \| \|	Enable the Style/TrailingCommaInArguments cop	Rémy Coutable	2017-05-10	49	-62/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \| \| \|	Enable the Style/TrailingCommaInLiteral cop	Rémy Coutable	2017-05-10	113	-156/+157
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-api-headings' into 'master'	Achilleas Pipinellis	2017-05-10	14	-14/+14
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add "API" to API docs Closes #32105 See merge request !11261
\| * \| \| \| \| \| \| \| \| \|	update API doc with +API (h1 heading)	Marcia Ramos	2017-05-10	14	-14/+14
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-security-patches' into 'master'	Robert Speicher	2017-05-10	56	-311/+831
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Security patches -> `master` See merge request !11230
\| * \| \| \| \| \| \| \| \| \|	Use new SnippetsFinder signature in APIbvl-security-patches	Bob Van Landuyt	2017-05-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use `described_class` in SnippetsFinder-spec	Bob Van Landuyt	2017-05-10	1	-21/+21
\| \| \| \| \| \| \| \| \| \| \|