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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixed karma spec with elements not appearing in DOMrefactor-realtime-issue	Phil Hughes	2017-05-11	1	-0/+1
\|
*	Remove some weird code to add/remove the task status	Phil Hughes	2017-05-11	5	-45/+46
\| \| \| \| \|	Moved the data into the data method Renamed edited ago class name
*	Merge branch 'master' into refactor-realtime-issue	Phil Hughes	2017-05-11	286	-707/+1715
\|\
\| *	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
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'tc-fix-private-subgroups-shown' into 'security'	Douwe Maan	2017-05-10	8	-19/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use GroupsFinder to find subgroups the user has access to See merge request !2096
\| \| * \| \| \| \| \|	Merge branch 'fix-hamlit-xss' into 'security-9-1'	Robert Speicher	2017-05-10	5	-3/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New Hamlit XSS fix, does not include extraneous changes See merge request !2095
\| \| * \| \| \| \| \|	Merge branch 'snippets-finder-visibility' into 'security'	Douwe Maan	2017-05-10	23	-184/+399
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor snippets finder & dont return internal snippets for external users See merge request !2094
\| \| * \| \| \| \| \|	Merge branch 'branch-name-escape' into 'security'	Robert Speicher	2017-05-10	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix XSS in branches dropdown See merge request !2093
\| \| * \| \| \| \| \|	Merge branch '31157-respect-project-features-in-wiki-search' into 'security'	Douwe Maan	2017-05-10	3	-3/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect project features in wiki and blob search See merge request !2089
\| \| * \| \| \| \| \|	Merge branch 'snippets_visibility' into 'security'	Sean McGivern	2017-05-10	4	-12/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix snippets visibility for show action - external users can not see internal snippets See merge request !2087
\| \| * \| \| \| \| \|	Merge branch 'rs-sanitize-submodule-urls' into 'security'	Douwe Maan	2017-05-10	3	-16/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sanitize submodule URLs before linking to them in the file tree view See merge request !2084
\| \| * \| \| \| \| \|	Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri'	Robert Speicher	2017-05-10	4	-56/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(security-9-1) Add correct `rel` attributes to external links when rendering markdown See merge request !2097
\| \| * \| \| \| \| \|	Merge branch 'bvl-security-9-1-markup-pipeline'	Robert Speicher	2017-05-10	7	-17/+42
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(security-9-1) Render asciidoc & other markup using banzai in a pipeline See merge request !2098
\| * \| \| \| \| \|	Merge branch ↵	Phil Hughes	2017-05-10	7	-13/+97
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'31474-issue-boards-sidebar-milestone-dropdown-should-not-be-multi-select' into 'master' Resolve "Issue boards sidebar milestone dropdown should not be multi select" Closes #31474 See merge request !11084
\| \| * \| \| \| \| \|	Disallow multiselect for Milestone dropdown	Sam Rose	2017-05-10	7	-13/+97
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'tc-clean-pending-delete-projects' into 'master'	Douwe Maan	2017-05-10	6	-0/+206
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Post-deploy to clean `pending_delete` projects Closes #20984 See merge request !11044
\| \| * \| \| \| \| \| \|	No user needed to cleanup namespaceless pending delete projects	Toon Claes	2017-05-10	4	-21/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since this is a cleanup, ran by a post-deploy, there is no need to lookup the admin to run the cleanup.
\| \| * \| \| \| \| \| \|	Use worker to destroy namespaceless projects in post-deploy	Toon Claes	2017-05-10	7	-116/+202
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Destroying projects can be very time consuming. So instead of destroying them in the post-deploy, just schedule them and make Sidekiq do the hard work. They are scheduled in batches of 5000 records. This way the number of database requests is limited while also the amount data read to memory is limited.
\| \| * \| \| \| \| \| \|	No user is needed to delete a project	Toon Claes	2017-05-10	1	-4/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add post-deploy migrate to cleanup projects in pending delete state	Toon Claes	2017-05-10	3	-0/+123
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There are many projects in `pending_delete` state, this post-deploy migration cleans them up. The script is based on https://gitlab.com/gitlab-org/gitlab-ce/snippets/1648654 and https://gitlab.com/gitlab-org/gitlab-ce/snippets/1611429. The use of these scripts were described in https://gitlab.com/gitlab-com/infrastructure/issues/888.
\| * \| \| \| \| \| \| \|	Merge branch 'cycle-analytics-stage-title-translation-fix' into 'master'	Filipa Lacerda	2017-05-10	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed the stage title translation in cycle analytics See merge request !11252
\| \| * \| \| \| \| \| \| \|	Fixed the stage title translation in cycle analytics	Phil Hughes	2017-05-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \|